From a4f941305515c1b6fa0c6e2b5302b0a48a3c3f28 Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Fri, 23 Oct 2026 16:14:36 +0800 Subject: [PATCH] =?UTF-8?q?cim-=E6=89=A7=E6=B3=95=E4=BA=BA=E5=91=98?= =?UTF-8?q?=EF=BC=8C=E6=89=A7=E6=B3=95=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../其他/njy/2026-1.10.0.sql | 5 +++ .../cim/CimDashboardOverviewController.java | 10 ++++++ .../move/MoveSupervisionController.java | 2 ++ .../domain/vo/CimDashboardOverviewVo.java | 4 +++ .../mapper/CimDashboardOverviewMapper.java | 9 +++++ .../service/ICimDashboardOverviewService.java | 7 ++++ .../impl/CimDashboardOverviewServiceImpl.java | 19 +++++++++++ .../CimDashboardOverviewMapper.xml | 33 +++++++++++++++++++ 8 files changed, 89 insertions(+) diff --git a/script/sql/zfjd-refactoring-v1/其他/njy/2026-1.10.0.sql b/script/sql/zfjd-refactoring-v1/其他/njy/2026-1.10.0.sql index d5a201eb..94bc8d0a 100644 --- a/script/sql/zfjd-refactoring-v1/其他/njy/2026-1.10.0.sql +++ b/script/sql/zfjd-refactoring-v1/其他/njy/2026-1.10.0.sql @@ -112,3 +112,8 @@ ALTER TABLE dashboard_trend_stat_domain ADD thirdTime varchar(100) NULL COMMENT ALTER TABLE dashboard_trend_stat_domain CHANGE thirdTime thirdTime varchar(100) NULL COMMENT '三季度时间' AFTER thirdQuarter; ALTER TABLE dashboard_trend_stat_domain ADD fourthTime varchar(100) NULL COMMENT '四季度时间'; ALTER TABLE dashboard_trend_stat_domain CHANGE fourthTime fourthTime varchar(100) NULL COMMENT '四季度时间' AFTER fourthQuarter; + + + +ALTER TABLE zfjd_ef20_1_2026_07_13.dashboard_area_info ADD area_code varchar(100) NULL COMMENT '行政区编码'; +ALTER TABLE zfjd_ef20_1_2026_07_13.dashboard_area_info CHANGE area_code area_code varchar(100) NULL COMMENT '行政区编码' AFTER name; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewController.java index 7f8f3799..4e3645c0 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewController.java @@ -15,6 +15,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.util.Date; import java.util.List; +import java.util.Map; /** @@ -58,6 +59,15 @@ public class CimDashboardOverviewController { return R.ok(vo); } + /** + * Cim大屏-大屏总览 查询各区执法人员数据,企业数量，执法单位数量 + */ + @GetMapping("/getAreaCount") + public R> getAreaCount(CimDashboardOverviewQueryBo bo){ + return R.ok(cimDashboardOverviewService.getAreaCount(bo)); + } + + /** * Cim大屏-大屏总览 查询 单独部门执法-联合执法-被执法企业-入企压减率-执法人员数-执法单位数 * （实） diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/move/MoveSupervisionController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/move/MoveSupervisionController.java index 7391f12d..4f56cc52 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/move/MoveSupervisionController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/move/MoveSupervisionController.java @@ -1,6 +1,7 @@ package com.zdxt.enforcementcode.controller.web.supervision.move; +import cn.dev33.satoken.annotation.SaIgnore; import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatQueryBo; import com.zdxt.enforcementcode.domain.vo.DashboardSituationAreaVo; import com.zdxt.enforcementcode.domain.vo.DashboardSituationDomainVo; @@ -21,6 +22,7 @@ import java.util.Map; /** * 移动监督端 */ +@SaIgnore @Validated @RequiredArgsConstructor @RestController diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/CimDashboardOverviewVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/CimDashboardOverviewVo.java index 8084b804..4bb52e32 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/CimDashboardOverviewVo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/CimDashboardOverviewVo.java @@ -118,6 +118,10 @@ public class CimDashboardOverviewVo { */ private String code; + /** + * 行政区编码 + */ + private String areaCode; /** * 名称 */ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/CimDashboardOverviewMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/CimDashboardOverviewMapper.java index b49accad..e57231ba 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/CimDashboardOverviewMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/CimDashboardOverviewMapper.java @@ -37,6 +37,15 @@ public interface CimDashboardOverviewMapper extends BaseMapperPlus getLawPersonnelCount(CimDashboardOverviewQueryBo bo); + + /** + * 获取执法人员数 + */ + List getLawUnitCount(CimDashboardOverviewQueryBo bo); /** * 获取计划总数（月） * @param bo diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewService.java index 257874b9..e4e54880 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewService.java @@ -3,8 +3,10 @@ package com.zdxt.enforcementcode.service; import com.zdxt.enforcementcode.domain.bo.CimDashboardOverviewQueryBo; import com.zdxt.enforcementcode.domain.bo.SixAnalysisParamsBo; import com.zdxt.enforcementcode.domain.vo.CimDashboardOverviewVo; +import io.netty.util.internal.MacAddressUtil; import java.util.List; +import java.util.Map; /** * cim大屏-大屏总览 @@ -32,6 +34,11 @@ public interface ICimDashboardOverviewService { */ Long getNonEnfRegistrationCount(CimDashboardOverviewQueryBo bo); + /** + * 获取执法人员数，企业数量，执法单位数量 + */ + Map getAreaCount(CimDashboardOverviewQueryBo bo); + /** * 获取计划总数（月） * @param bo diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewServiceImpl.java index 2bef1175..f1e1f6d9 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewServiceImpl.java @@ -11,7 +11,9 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * cim大屏总览实现 @@ -57,6 +59,23 @@ public class CimDashboardOverviewServiceImpl implements ICimDashboardOverviewSer return cimDashboardOverviewMapper.getNonEnfRegistrationCount(bo); } + /** + * 获取执法人员数,企业数量，执法单位数量 + */ + @Override + public Map getAreaCount(CimDashboardOverviewQueryBo bo){ + Map map=new HashMap<>(); + //执法人员数量 + List list1=cimDashboardOverviewMapper.getLawPersonnelCount(bo); + map.put("areaPersonnel",list1); + + //执法单位数量 + List list2=cimDashboardOverviewMapper.getLawUnitCount(bo); + map.put("areaUnit",list2); + //企业数量 + return map; + }; + /** * 查询计划总数（月） * @param bo diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/CimDashboardOverviewMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/CimDashboardOverviewMapper.xml index 9747c186..2da54db4 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/CimDashboardOverviewMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/CimDashboardOverviewMapper.xml @@ -127,6 +127,39 @@ + + +