From ee0f682cac03c7989ba00d8e2727cd2d4d00e1c1 Mon Sep 17 00:00:00 2001 From: niujiyi <18272501226@163.com> Date: Wed, 23 Sep 2026 17:24:50 +0800 Subject: [PATCH] =?UTF-8?q?cim-=E6=96=B0=E5=A2=9E=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=E6=80=BB=E8=A7=88=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../其他/njy/2026-1.10.0.sql | 96 ++++++++++++ ...CimDashboardOverviewDataSumController.java | 12 ++ .../CimDashboardOverviewJobController.java | 2 + .../domain/DashboardOverviewEnt.java | 116 +++++++++++++++ .../domain/DashboardOverviewPersonnel.java | 116 +++++++++++++++ .../domain/DashboardOverviewUnit.java | 116 +++++++++++++++ .../domain/bo/DashboardOverviewUnitBo.java | 120 +++++++++++++++ .../domain/vo/DashboardOverviewEntVo.java | 140 ++++++++++++++++++ .../vo/DashboardOverviewPersonnelVo.java | 140 ++++++++++++++++++ .../domain/vo/DashboardOverviewUnitVo.java | 140 ++++++++++++++++++ .../mapper/DashboardOverviewEntMapper.java | 15 ++ .../DashboardOverviewPersonnelMapper.java | 15 ++ .../mapper/DashboardOverviewUnitMapper.java | 15 ++ .../ICimDashboardOverviewDataSumService.java | 7 + ...mDashboardOverviewDataSumSserviceImpl.java | 40 +++++ .../DashboardOverviewEntMapper.xml | 6 + .../DashboardOverviewPersonnelMapper.xml | 6 + .../DashboardOverviewUnitMapper.xml | 6 + 18 files changed, 1108 insertions(+) create mode 100644 script/sql/zfjd-refactoring-v1/其他/njy/2026-1.10.0.sql create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/DashboardOverviewEnt.java create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/DashboardOverviewPersonnel.java create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/DashboardOverviewUnit.java create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardOverviewUnitBo.java create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardOverviewEntVo.java create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardOverviewPersonnelVo.java create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardOverviewUnitVo.java create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardOverviewEntMapper.java create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardOverviewPersonnelMapper.java create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardOverviewUnitMapper.java create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardOverviewEntMapper.xml create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardOverviewPersonnelMapper.xml create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardOverviewUnitMapper.xml 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 new file mode 100644 index 00000000..13bc7ca0 --- /dev/null +++ b/script/sql/zfjd-refactoring-v1/其他/njy/2026-1.10.0.sql @@ -0,0 +1,96 @@ +-- zfjd_ef20_1_2026_07_13.dashboard_overview 定义 + +CREATE TABLE `dashboard_overview_ent` ( + `id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '主键ID', + `city_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '市编码', + `city_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '市名称', + `district_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '区编码', + `district_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '区名称', + `street_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '街道编号', + `street_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '街道名称', + `level` tinyint NOT NULL COMMENT '级别：1-市 2-区 3-街道', + `bureau_dept_id` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '执法单位ID', + `bureau_dept_name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '执法单位名称', + `dept_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '部门ID', + `organ_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '组织单位ID', + `domain_id` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '领域ID', + `domain_name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '领域名称', + `year` int NOT NULL COMMENT '年份', + `month` int NOT NULL COMMENT '月份', + `qysl` int DEFAULT '0' COMMENT '企业数量', + `create_dept` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建部门ID', + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人ID', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '更新人ID', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `is_delete` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '0' COMMENT '逻辑删除：0-否 1-是', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_cdsym` (`city_code`,`district_code`,`street_code`,`year`,`month`), + KEY `idx_level` (`level`), + KEY `idx_year_month` (`year`,`month`), + KEY `idx_is_delete` (`is_delete`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='大屏总览统计-企业数量表'; + + +CREATE TABLE `dashboard_overview_unit` ( + `id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '主键ID', + `city_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '市编码', + `city_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '市名称', + `district_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '区编码', + `district_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '区名称', + `street_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '街道编号', + `street_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '街道名称', + `level` tinyint NOT NULL COMMENT '级别：1-市 2-区 3-街道', + `bureau_dept_id` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '执法单位ID', + `bureau_dept_name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '执法单位名称', + `dept_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '部门ID', + `organ_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '组织单位ID', + `domain_id` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '领域ID', + `domain_name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '领域名称', + `year` int NOT NULL COMMENT '年份', + `month` int NOT NULL COMMENT '月份', + `zfdws` int DEFAULT '0' COMMENT '执法单位数', + `create_dept` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建部门ID', + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人ID', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '更新人ID', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `is_delete` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '0' COMMENT '逻辑删除：0-否 1-是', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_cdsym` (`city_code`,`district_code`,`street_code`,`year`,`month`), + KEY `idx_level` (`level`), + KEY `idx_year_month` (`year`,`month`), + KEY `idx_is_delete` (`is_delete`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='大屏总览统计-执法单位数表'; + + +CREATE TABLE `dashboard_overview_personnel` ( + `id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '主键ID', + `city_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '市编码', + `city_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '市名称', + `district_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '区编码', + `district_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '区名称', + `street_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '街道编号', + `street_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '街道名称', + `level` tinyint NOT NULL COMMENT '级别：1-市 2-区 3-街道', + `bureau_dept_id` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '执法单位ID', + `bureau_dept_name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '执法单位名称', + `dept_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '部门ID', + `organ_id` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '组织单位ID', + `domain_id` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '领域ID', + `domain_name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '领域名称', + `year` int NOT NULL COMMENT '年份', + `month` int NOT NULL COMMENT '月份', + `zfrys` int DEFAULT '0' COMMENT '执法人员数', + `create_dept` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建部门ID', + `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人ID', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '更新人ID', + `update_time` datetime DEFAULT NULL COMMENT '更新时间', + `is_delete` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '0' COMMENT '逻辑删除：0-否 1-是', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_cdsym` (`city_code`,`district_code`,`street_code`,`year`,`month`), + KEY `idx_level` (`level`), + KEY `idx_year_month` (`year`,`month`), + KEY `idx_is_delete` (`is_delete`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='大屏总览统计-执法人员数表'; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewDataSumController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewDataSumController.java index 1a8d121a..a9175dd3 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewDataSumController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewDataSumController.java @@ -49,6 +49,18 @@ public class CimDashboardOverviewDataSumController { return R.ok(vo); } + + /** + * Cim-大屏总览-区域月数据汇总-企业数量-执法单位数-执法人员数 + * @param + * @return + */ + @GetMapping("/getDashboardOverviewMonthDataSumMap") + public R> getDashboardOverviewMonthDataSumMap(CimDashboardOverviewQueryBo bo) { + //查询大屏总览数据（月度） + Map map= cimDashboardOverviewDataSumService.getDashboardOverviewMonthDataSumMap(bo); + return R.ok(map); + } /** * Cim大屏-监测预警-高频检查预警分析-区域月数据汇总-高频检查区域-高频检查企业-高频检查区域执法单位联合执法数排行-高频检查区域执法单位检查次数排行 * @return diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewJobController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewJobController.java index 046c5b34..c9e1cbbe 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewJobController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewJobController.java @@ -1,6 +1,7 @@ package com.zdxt.enforcementcode.controller.cim; +import cn.dev33.satoken.annotation.SaIgnore; import com.zdxt.enforcementcode.service.ICimDashboardOverviewDataSumService; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; @@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController; * @author niujiyi * @date 2023-08-07 */ +@SaIgnore @Validated @RequiredArgsConstructor @RestController diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/DashboardOverviewEnt.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/DashboardOverviewEnt.java new file mode 100644 index 00000000..167ad91c --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/DashboardOverviewEnt.java @@ -0,0 +1,116 @@ +package com.zdxt.enforcementcode.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 大屏总览统计-企业数量对象 dashboard_overview_ent + * + * @author Lion Li + * @date 2026-09-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dashboard_overview_ent") +public class DashboardOverviewEnt extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private String id; + + /** + * 市编码 + */ + private String cityCode; + + /** + * 市名称 + */ + private String cityName; + + /** + * 区编码 + */ + private String districtCode; + + /** + * 区名称 + */ + private String districtName; + + /** + * 街道编号 + */ + private String streetCode; + + /** + * 街道名称 + */ + private String streetName; + + /** + * 级别：1-市 2-区 3-街道 + */ + private Long level; + + /** + * 执法单位ID + */ + private String bureauDeptId; + + /** + * 执法单位名称 + */ + private String bureauDeptName; + + /** + * 部门ID + */ + private String deptId; + + /** + * 组织单位ID + */ + private String organId; + + /** + * 领域ID + */ + private String domainId; + + /** + * 领域名称 + */ + private String domainName; + + /** + * 年份 + */ + private Long year; + + /** + * 月份 + */ + private Long month; + + /** + * 企业数量 + */ + private Long qysl; + + /** + * 逻辑删除：0-否 1-是 + */ + private String isDelete; + + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/DashboardOverviewPersonnel.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/DashboardOverviewPersonnel.java new file mode 100644 index 00000000..589c5e0d --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/DashboardOverviewPersonnel.java @@ -0,0 +1,116 @@ +package com.zdxt.enforcementcode.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 大屏总览统计-执法人员数对象 dashboard_overview_personnel + * + * @author Lion Li + * @date 2026-09-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dashboard_overview_personnel") +public class DashboardOverviewPersonnel extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private String id; + + /** + * 市编码 + */ + private String cityCode; + + /** + * 市名称 + */ + private String cityName; + + /** + * 区编码 + */ + private String districtCode; + + /** + * 区名称 + */ + private String districtName; + + /** + * 街道编号 + */ + private String streetCode; + + /** + * 街道名称 + */ + private String streetName; + + /** + * 级别：1-市 2-区 3-街道 + */ + private Long level; + + /** + * 执法单位ID + */ + private String bureauDeptId; + + /** + * 执法单位名称 + */ + private String bureauDeptName; + + /** + * 部门ID + */ + private String deptId; + + /** + * 组织单位ID + */ + private String organId; + + /** + * 领域ID + */ + private String domainId; + + /** + * 领域名称 + */ + private String domainName; + + /** + * 年份 + */ + private Long year; + + /** + * 月份 + */ + private Long month; + + /** + * 执法人员数 + */ + private Long zfrys; + + /** + * 逻辑删除：0-否 1-是 + */ + private String isDelete; + + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/DashboardOverviewUnit.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/DashboardOverviewUnit.java new file mode 100644 index 00000000..2424e39b --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/DashboardOverviewUnit.java @@ -0,0 +1,116 @@ +package com.zdxt.enforcementcode.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 大屏总览统计-执法单位数对象 dashboard_overview_unit + * + * @author Lion Li + * @date 2026-09-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dashboard_overview_unit") +public class DashboardOverviewUnit extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private String id; + + /** + * 市编码 + */ + private String cityCode; + + /** + * 市名称 + */ + private String cityName; + + /** + * 区编码 + */ + private String districtCode; + + /** + * 区名称 + */ + private String districtName; + + /** + * 街道编号 + */ + private String streetCode; + + /** + * 街道名称 + */ + private String streetName; + + /** + * 级别：1-市 2-区 3-街道 + */ + private Long level; + + /** + * 执法单位ID + */ + private String bureauDeptId; + + /** + * 执法单位名称 + */ + private String bureauDeptName; + + /** + * 部门ID + */ + private String deptId; + + /** + * 组织单位ID + */ + private String organId; + + /** + * 领域ID + */ + private String domainId; + + /** + * 领域名称 + */ + private String domainName; + + /** + * 年份 + */ + private Long year; + + /** + * 月份 + */ + private Long month; + + /** + * 执法单位数 + */ + private Long zfdws; + + /** + * 逻辑删除：0-否 1-是 + */ + private String isDelete; + + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardOverviewUnitBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardOverviewUnitBo.java new file mode 100644 index 00000000..a329ae66 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardOverviewUnitBo.java @@ -0,0 +1,120 @@ +package com.zdxt.enforcementcode.domain.bo; + +import com.zdxt.enforcementcode.domain.DashboardOverviewUnit; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 大屏总览统计-执法单位数业务对象 dashboard_overview_unit + * + * @author Lion Li + * @date 2026-09-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DashboardOverviewUnit.class, reverseConvertGenerate = false) +public class DashboardOverviewUnitBo extends BaseEntity { + + /** + * 主键ID + */ + @NotBlank(message = "主键ID不能为空", groups = { EditGroup.class }) + private String id; + + /** + * 市编码 + */ + @NotBlank(message = "市编码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String cityCode; + + /** + * 市名称 + */ + @NotBlank(message = "市名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String cityName; + + /** + * 区编码 + */ + private String districtCode; + + /** + * 区名称 + */ + private String districtName; + + /** + * 街道编号 + */ + private String streetCode; + + /** + * 街道名称 + */ + private String streetName; + + /** + * 级别：1-市 2-区 3-街道 + */ + @NotNull(message = "级别：1-市 2-区 3-街道不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long level; + + /** + * 执法单位ID + */ + private String bureauDeptId; + + /** + * 执法单位名称 + */ + private String bureauDeptName; + + /** + * 部门ID + */ + private String deptId; + + /** + * 组织单位ID + */ + private String organId; + + /** + * 领域ID + */ + private String domainId; + + /** + * 领域名称 + */ + private String domainName; + + /** + * 年份 + */ + @NotNull(message = "年份不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long year; + + /** + * 月份 + */ + @NotNull(message = "月份不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long month; + + /** + * 执法单位数 + */ + private Long zfdws; + + /** + * 逻辑删除：0-否 1-是 + */ + private String isDelete; + + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardOverviewEntVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardOverviewEntVo.java new file mode 100644 index 00000000..20240aff --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardOverviewEntVo.java @@ -0,0 +1,140 @@ +package com.zdxt.enforcementcode.domain.vo; + +import com.zdxt.enforcementcode.domain.DashboardOverviewEnt; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 大屏总览统计-企业数量视图对象 dashboard_overview_ent + * + * @author Lion Li + * @date 2026-09-23 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DashboardOverviewEnt.class) +public class DashboardOverviewEntVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private String id; + + /** + * 市编码 + */ + @ExcelProperty(value = "市编码") + private String cityCode; + + /** + * 市名称 + */ + @ExcelProperty(value = "市名称") + private String cityName; + + /** + * 区编码 + */ + @ExcelProperty(value = "区编码") + private String districtCode; + + /** + * 区名称 + */ + @ExcelProperty(value = "区名称") + private String districtName; + + /** + * 街道编号 + */ + @ExcelProperty(value = "街道编号") + private String streetCode; + + /** + * 街道名称 + */ + @ExcelProperty(value = "街道名称") + private String streetName; + + /** + * 级别：1-市 2-区 3-街道 + */ + @ExcelProperty(value = "级别：1-市 2-区 3-街道") + private Long level; + + /** + * 执法单位ID + */ + @ExcelProperty(value = "执法单位ID") + private String bureauDeptId; + + /** + * 执法单位名称 + */ + @ExcelProperty(value = "执法单位名称") + private String bureauDeptName; + + /** + * 部门ID + */ + @ExcelProperty(value = "部门ID") + private String deptId; + + /** + * 组织单位ID + */ + @ExcelProperty(value = "组织单位ID") + private String organId; + + /** + * 领域ID + */ + @ExcelProperty(value = "领域ID") + private String domainId; + + /** + * 领域名称 + */ + @ExcelProperty(value = "领域名称") + private String domainName; + + /** + * 年份 + */ + @ExcelProperty(value = "年份") + private Long year; + + /** + * 月份 + */ + @ExcelProperty(value = "月份") + private Long month; + + /** + * 企业数量 + */ + @ExcelProperty(value = "企业数量") + private Long qysl; + + /** + * 逻辑删除：0-否 1-是 + */ + @ExcelProperty(value = "逻辑删除：0-否 1-是") + private String isDelete; + + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardOverviewPersonnelVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardOverviewPersonnelVo.java new file mode 100644 index 00000000..6a372d06 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardOverviewPersonnelVo.java @@ -0,0 +1,140 @@ +package com.zdxt.enforcementcode.domain.vo; + +import com.zdxt.enforcementcode.domain.DashboardOverviewPersonnel; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 大屏总览统计-执法人员数视图对象 dashboard_overview_personnel + * + * @author Lion Li + * @date 2026-09-23 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DashboardOverviewPersonnel.class) +public class DashboardOverviewPersonnelVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private String id; + + /** + * 市编码 + */ + @ExcelProperty(value = "市编码") + private String cityCode; + + /** + * 市名称 + */ + @ExcelProperty(value = "市名称") + private String cityName; + + /** + * 区编码 + */ + @ExcelProperty(value = "区编码") + private String districtCode; + + /** + * 区名称 + */ + @ExcelProperty(value = "区名称") + private String districtName; + + /** + * 街道编号 + */ + @ExcelProperty(value = "街道编号") + private String streetCode; + + /** + * 街道名称 + */ + @ExcelProperty(value = "街道名称") + private String streetName; + + /** + * 级别：1-市 2-区 3-街道 + */ + @ExcelProperty(value = "级别：1-市 2-区 3-街道") + private Long level; + + /** + * 执法单位ID + */ + @ExcelProperty(value = "执法单位ID") + private String bureauDeptId; + + /** + * 执法单位名称 + */ + @ExcelProperty(value = "执法单位名称") + private String bureauDeptName; + + /** + * 部门ID + */ + @ExcelProperty(value = "部门ID") + private String deptId; + + /** + * 组织单位ID + */ + @ExcelProperty(value = "组织单位ID") + private String organId; + + /** + * 领域ID + */ + @ExcelProperty(value = "领域ID") + private String domainId; + + /** + * 领域名称 + */ + @ExcelProperty(value = "领域名称") + private String domainName; + + /** + * 年份 + */ + @ExcelProperty(value = "年份") + private Long year; + + /** + * 月份 + */ + @ExcelProperty(value = "月份") + private Long month; + + /** + * 执法人员数 + */ + @ExcelProperty(value = "执法人员数") + private Long zfrys; + + /** + * 逻辑删除：0-否 1-是 + */ + @ExcelProperty(value = "逻辑删除：0-否 1-是") + private String isDelete; + + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardOverviewUnitVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardOverviewUnitVo.java new file mode 100644 index 00000000..47ab5eb7 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardOverviewUnitVo.java @@ -0,0 +1,140 @@ +package com.zdxt.enforcementcode.domain.vo; + +import com.zdxt.enforcementcode.domain.DashboardOverviewUnit; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 大屏总览统计-执法单位数视图对象 dashboard_overview_unit + * + * @author Lion Li + * @date 2026-09-23 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DashboardOverviewUnit.class) +public class DashboardOverviewUnitVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private String id; + + /** + * 市编码 + */ + @ExcelProperty(value = "市编码") + private String cityCode; + + /** + * 市名称 + */ + @ExcelProperty(value = "市名称") + private String cityName; + + /** + * 区编码 + */ + @ExcelProperty(value = "区编码") + private String districtCode; + + /** + * 区名称 + */ + @ExcelProperty(value = "区名称") + private String districtName; + + /** + * 街道编号 + */ + @ExcelProperty(value = "街道编号") + private String streetCode; + + /** + * 街道名称 + */ + @ExcelProperty(value = "街道名称") + private String streetName; + + /** + * 级别：1-市 2-区 3-街道 + */ + @ExcelProperty(value = "级别：1-市 2-区 3-街道") + private Long level; + + /** + * 执法单位ID + */ + @ExcelProperty(value = "执法单位ID") + private String bureauDeptId; + + /** + * 执法单位名称 + */ + @ExcelProperty(value = "执法单位名称") + private String bureauDeptName; + + /** + * 部门ID + */ + @ExcelProperty(value = "部门ID") + private String deptId; + + /** + * 组织单位ID + */ + @ExcelProperty(value = "组织单位ID") + private String organId; + + /** + * 领域ID + */ + @ExcelProperty(value = "领域ID") + private String domainId; + + /** + * 领域名称 + */ + @ExcelProperty(value = "领域名称") + private String domainName; + + /** + * 年份 + */ + @ExcelProperty(value = "年份") + private Long year; + + /** + * 月份 + */ + @ExcelProperty(value = "月份") + private Long month; + + /** + * 执法单位数 + */ + @ExcelProperty(value = "执法单位数") + private Long zfdws; + + /** + * 逻辑删除：0-否 1-是 + */ + @ExcelProperty(value = "逻辑删除：0-否 1-是") + private String isDelete; + + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardOverviewEntMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardOverviewEntMapper.java new file mode 100644 index 00000000..5deb04e5 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardOverviewEntMapper.java @@ -0,0 +1,15 @@ +package com.zdxt.enforcementcode.mapper; + +import com.zdxt.enforcementcode.domain.DashboardOverviewEnt; +import com.zdxt.enforcementcode.domain.vo.DashboardOverviewEntVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 大屏总览统计-企业数量Mapper接口 + * + * @author Lion Li + * @date 2026-09-23 + */ +public interface DashboardOverviewEntMapper extends BaseMapperPlus { + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardOverviewPersonnelMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardOverviewPersonnelMapper.java new file mode 100644 index 00000000..8dee93c7 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardOverviewPersonnelMapper.java @@ -0,0 +1,15 @@ +package com.zdxt.enforcementcode.mapper; + +import com.zdxt.enforcementcode.domain.DashboardOverviewPersonnel; +import com.zdxt.enforcementcode.domain.vo.DashboardOverviewPersonnelVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 大屏总览统计-执法人员数Mapper接口 + * + * @author Lion Li + * @date 2026-09-23 + */ +public interface DashboardOverviewPersonnelMapper extends BaseMapperPlus { + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardOverviewUnitMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardOverviewUnitMapper.java new file mode 100644 index 00000000..ad9ca04c --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardOverviewUnitMapper.java @@ -0,0 +1,15 @@ +package com.zdxt.enforcementcode.mapper; + +import com.zdxt.enforcementcode.domain.DashboardOverviewUnit; +import com.zdxt.enforcementcode.domain.vo.DashboardOverviewUnitVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 大屏总览统计-执法单位数Mapper接口 + * + * @author Lion Li + * @date 2026-09-23 + */ +public interface DashboardOverviewUnitMapper extends BaseMapperPlus { + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewDataSumService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewDataSumService.java index 1d71e700..5ea9f303 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewDataSumService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ICimDashboardOverviewDataSumService.java @@ -29,6 +29,13 @@ public interface ICimDashboardOverviewDataSumService { List getDashboardOverviewMonthDataSum(); + /** + * Cim大屏-查询大屏总览汇总月度数据 + * @return + */ + Map getDashboardOverviewMonthDataSumMap(CimDashboardOverviewQueryBo bo); + + /** * Cim大屏-查询高频检查预警-区域月度数据 * 定时任务调用方法 diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java index 74b3b966..e5effcba 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java @@ -43,6 +43,9 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve private final DashboardEnterpriseCheckMapper dashboardEnterpriseCheckMapper; private final DashboardTrendStatAreaMapper dashboardTrendStatAreaMapper; private final DashboardTrendStatDomainMapper dashboardTrendStatDomainMapper; + private final DashboardOverviewEntMapper dashboardOverviewEntMapper; + private final DashboardOverviewUnitMapper dashboardOverviewUnitMapper; + private final DashboardOverviewPersonnelMapper dashboardOverviewPersonnelMapper; /** @@ -124,6 +127,43 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve } + /** + * Cim大屏-查询大屏总览汇总月度数据-企业数量-执法单位数-执法人员数 + * @return + */ + @Override + public Map getDashboardOverviewMonthDataSumMap(CimDashboardOverviewQueryBo bo) { + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(DashboardOverviewEnt::getIsDelete, "0"); + queryWrapper.eq(DashboardOverviewEnt::getYear, getDateTime().getYear()); + queryWrapper.eq(DashboardOverviewEnt::getMonth, getDateTime().getMonth()); + queryWrapper.eq(DashboardOverviewEnt::getDistrictCode,bo.getCode()); + List list = dashboardOverviewEntMapper.selectList(queryWrapper); + + LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); + queryWrapper2.eq(DashboardOverviewUnit::getIsDelete, "0"); + queryWrapper2.eq(DashboardOverviewUnit::getYear, getDateTime().getYear()); + queryWrapper2.eq(DashboardOverviewUnit::getMonth, getDateTime().getMonth()); + queryWrapper2.eq(DashboardOverviewUnit::getDistrictCode,bo.getCode()); + List list2 = dashboardOverviewUnitMapper.selectList(queryWrapper2); + + LambdaQueryWrapper queryWrapper3 = new LambdaQueryWrapper<>(); + queryWrapper3.eq(DashboardOverviewPersonnel::getIsDelete, "0"); + queryWrapper3.eq(DashboardOverviewPersonnel::getYear, getDateTime().getYear()); + queryWrapper3.eq(DashboardOverviewPersonnel::getMonth, getDateTime().getMonth()); + queryWrapper3.eq(DashboardOverviewPersonnel::getDistrictCode,bo.getCode()); + List list3 = dashboardOverviewPersonnelMapper.selectList(queryWrapper3); + + Map map = new HashMap<>(); + map.put("entList", list); + map.put("unitList", list2); + map.put("personnelList", list3); + + return map; + } + + /** * Cim-大屏总览 * 添加月度数据 diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardOverviewEntMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardOverviewEntMapper.xml new file mode 100644 index 00000000..ba508e9c --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardOverviewEntMapper.xml @@ -0,0 +1,6 @@ + + + + diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardOverviewPersonnelMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardOverviewPersonnelMapper.xml new file mode 100644 index 00000000..20aabeb9 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardOverviewPersonnelMapper.xml @@ -0,0 +1,6 @@ + + + + diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardOverviewUnitMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardOverviewUnitMapper.xml new file mode 100644 index 00000000..ddb361bc --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardOverviewUnitMapper.xml @@ -0,0 +1,6 @@ + + + +