diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardCheckRegisterAreaController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardCheckRegisterAreaController.java new file mode 100644 index 00000000..68d0cbec --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardCheckRegisterAreaController.java @@ -0,0 +1,43 @@ +package com.zdxt.enforcementcode.controller.web.supervision; + +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterAreaBo; +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterAreaQueryBo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterAreaInfoVo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterAreaVo; +import com.zdxt.enforcementcode.service.IDashboardCheckRegisterAreaService; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 大屏-检查登记-区域统计 + * + * @author Lion Li + * @date 2026-06-02 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/web/dashboard/checkRegisterArea") +public class DashboardCheckRegisterAreaController extends BaseController { + + private final IDashboardCheckRegisterAreaService dashboardCheckRegisterAreaService; + + /** + * 查询大屏-检查登记-区域统计列表 + */ + @GetMapping("/getAreaInfo") + public R getCheckRegisterArea(DashboardCheckRegisterAreaQueryBo bo) { + //1、默认查询上个月的数据 + //2、totalCheckRegisterAreaInfo 查询条件: 年+月+城市code+level = 1 + //3、checkRegisterAreaList 查询条件: 年+月+城市code+level = 2 + return dashboardCheckRegisterAreaService.getCheckRegisterArea(bo); + } + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardCheckRegisterDomainController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardCheckRegisterDomainController.java new file mode 100644 index 00000000..ff4d77d6 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/DashboardCheckRegisterDomainController.java @@ -0,0 +1,40 @@ +package com.zdxt.enforcementcode.controller.web.supervision; + +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterDomainQueryBo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterDomainInfoVo; +import com.zdxt.enforcementcode.service.IDashboardCheckRegisterDomainService; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.web.core.BaseController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 大屏-检查登记-领域统计 + * + * @author Lion Li + * @date 2026-06-02 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/web/dashboard/checkRegisterDomain") +public class DashboardCheckRegisterDomainController extends BaseController { + + private final IDashboardCheckRegisterDomainService dashboardCheckRegisterDomainService; + + /** + * 查询大屏-检查登记-领域统计信息 + * 包含总体概览和各领域统计数据 + * + * @param bo 查询条件(年份、月份、城市编码,城市编码为空时查询所有) + * @return 领域统计信息 + */ + @GetMapping("/getDomainInfo") + public R getDomainInfo(DashboardCheckRegisterDomainQueryBo bo) { + return dashboardCheckRegisterDomainService.getDomainInfo(bo); + } + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bean/DashboardCheckRegisterArea.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bean/DashboardCheckRegisterArea.java new file mode 100644 index 00000000..ff3a726b --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bean/DashboardCheckRegisterArea.java @@ -0,0 +1,173 @@ +package com.zdxt.enforcementcode.domain.bean; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 大屏-检查登记-区域统计对象 dashboard_check_register_area + * + * @author Lion Li + * @date 2026-06-02 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dashboard_check_register_area") +public class DashboardCheckRegisterArea extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private String id; + + /** + * 年份 + */ + private Long year; + + /** + * 月份 1-12 + */ + private Long month; + + /** + * 地市编码 + */ + private String cityCode; + + /** + * 地市名称 + */ + private String cityName; + + /** + * 区县编码 + */ + private String areaCode; + + /** + * 区县名称 + */ + private String areaName; + + + /** + * 级别:1-市 2-区 3-街道 + */ + private Integer level; + + + /** + * 涉企检查总数 + */ + private Long sqjczs; + + /** + * 涉企检查同比% + */ + private Long sqjctb; + + /** + * 涉企检查环比% + */ + private Long sqjchb; + + /** + * 行政检查总数 + */ + private Long xzjczs; + + /** + * 行政检查同比% + */ + private Long xzjctb; + + /** + * 行政检查环比% + */ + private Long xzjchb; + + /** + * 行政处罚总数 + */ + private Long xzcfzs; + + /** + * 行政处罚同比% + */ + private Long xzcftb; + + /** + * 行政处罚环比% + */ + private Long xzcfhb; + + /** + * 行政强制总数 + */ + private Long xzzqzs; + + /** + * 行政强制同比% + */ + private Long xzzqtb; + + /** + * 行政强制环比% + */ + private Long xzzqhb; + + /** + * 其他执法总数 + */ + private Long qtzfzs; + + /** + * 其他执法同比% + */ + private Long qtzftb; + + /** + * 其他执法环比% + */ + private Long qtzfhb; + + /** + * 单独执法总数 + */ + private Long ddzfzs; + + /** + * 联合执法总数 + */ + private Long lhzfzs; + + /** + * 逻辑删除:0-否 1-是 + */ + private String isDelete; + + /** + * 局级部门ID + */ + private String bureauDeptId; + + /** + * 部门ID + */ + private String deptId; + + /** + * 组织单位ID + */ + private String organId; + + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bean/DashboardCheckRegisterDomain.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bean/DashboardCheckRegisterDomain.java new file mode 100644 index 00000000..a03e559a --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bean/DashboardCheckRegisterDomain.java @@ -0,0 +1,156 @@ +package com.zdxt.enforcementcode.domain.bean; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 大屏-检查登记-领域统计对象 dashboard_check_register_domain + * + * @author Lion Li + * @date 2026-06-02 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("dashboard_check_register_domain") +public class DashboardCheckRegisterDomain extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private String id; + + /** + * 年份 + */ + private Long year; + + /** + * 月份 1-12 + */ + private Long month; + + /** + * 领域ID + */ + private String lyid; + + /** + * 领域名称 + */ + private String lymc; + + /** + * 执法单位ID + */ + private String zfdwid; + + /** + * 执法单位名称 + */ + private String zfdwmc; + + /** + * 涉企检查总数 + */ + private Long sqjczs; + + /** + * 涉企检查同比% + */ + private Long sqjctb; + + /** + * 涉企检查环比% + */ + private Long sqjchb; + + /** + * 行政检查总数 + */ + private Long xzjczs; + + /** + * 行政检查同比% + */ + private Long xzjctb; + + /** + * 行政检查环比% + */ + private Long xzjchb; + + /** + * 行政处罚总数 + */ + private Long xzcfzs; + + /** + * 行政处罚同比% + */ + private Long xzcftb; + + /** + * 行政处罚环比% + */ + private Long xzcfhb; + + /** + * 行政强制总数 + */ + private Long xzzqzs; + + /** + * 行政强制同比% + */ + private Long xzzqtb; + + /** + * 行政强制环比% + */ + private Long xzzqhb; + + /** + * 其他执法总数 + */ + private Long qtzfzs; + + /** + * 其他执法同比% + */ + private Long qtzftb; + + /** + * 其他执法环比% + */ + private Long qtzfhb; + + /** + * 逻辑删除:0-否 1-是 + */ + private String isDelete; + + /** + * 局级部门ID + */ + private String bureauDeptId; + + /** + * 部门ID + */ + private String deptId; + + /** + * 组织单位ID + */ + private String organId; + + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardCheckRegisterAreaBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardCheckRegisterAreaBo.java new file mode 100644 index 00000000..f4c47161 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardCheckRegisterAreaBo.java @@ -0,0 +1,175 @@ +package com.zdxt.enforcementcode.domain.bo; + +import com.zdxt.enforcementcode.domain.bean.DashboardCheckRegisterArea; +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_check_register_area + * + * @author Lion Li + * @date 2026-06-02 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DashboardCheckRegisterArea.class, reverseConvertGenerate = false) +public class DashboardCheckRegisterAreaBo extends BaseEntity { + + /** + * 主键ID + */ + @NotBlank(message = "主键ID不能为空", groups = { EditGroup.class }) + private String id; + + /** + * 年份 + */ + @NotNull(message = "年份不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long year; + + /** + * 月份 1-12 + */ + @NotNull(message = "月份 1-12不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long month; + + /** + * 地市编码 + */ + @NotBlank(message = "地市编码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String cityCode; + + /** + * 地市名称 + */ + @NotBlank(message = "地市名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String cityName; + + /** + * 区县编码 + */ + @NotBlank(message = "区县编码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String areaCode; + + /** + * 区县名称 + */ + @NotBlank(message = "区县名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String areaName; + + /** + * 级别:1-市 2-区 3-街道 + */ + private Integer level; + /** + * 涉企检查总数 + */ + private Long sqjczs; + + /** + * 涉企检查同比% + */ + private Long sqjctb; + + /** + * 涉企检查环比% + */ + private Long sqjchb; + + /** + * 行政检查总数 + */ + private Long xzjczs; + + /** + * 行政检查同比% + */ + private Long xzjctb; + + /** + * 行政检查环比% + */ + private Long xzjchb; + + /** + * 行政处罚总数 + */ + private Long xzcfzs; + + /** + * 行政处罚同比% + */ + private Long xzcftb; + + /** + * 行政处罚环比% + */ + private Long xzcfhb; + + /** + * 行政强制总数 + */ + private Long xzzqzs; + + /** + * 行政强制同比% + */ + private Long xzzqtb; + + /** + * 行政强制环比% + */ + private Long xzzqhb; + + /** + * 其他执法总数 + */ + private Long qtzfzs; + + /** + * 其他执法同比% + */ + private Long qtzftb; + + /** + * 其他执法环比% + */ + private Long qtzfhb; + + /** + * 单独执法总数 + */ + private Long ddzfzs; + + /** + * 联合执法总数 + */ + private Long lhzfzs; + + /** + * 逻辑删除:0-否 1-是 + */ + private String isDelete; + + /** + * 局级部门ID + */ + private String bureauDeptId; + + /** + * 部门ID + */ + private String deptId; + + /** + * 组织单位ID + */ + private String organId; + + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardCheckRegisterAreaQueryBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardCheckRegisterAreaQueryBo.java new file mode 100644 index 00000000..21e44558 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardCheckRegisterAreaQueryBo.java @@ -0,0 +1,43 @@ +package com.zdxt.enforcementcode.domain.bo; + +import com.zdxt.enforcementcode.domain.bean.DashboardCheckRegisterArea; +import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +/** + * 大屏-检查登记-区域统计业务对象 dashboard_check_register_area + * + * @author Lion Li + * @date 2026-06-02 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DashboardCheckRegisterArea.class, reverseConvertGenerate = false) +public class DashboardCheckRegisterAreaQueryBo extends BaseEntity { + + /** + * 年份 + */ + private Long year; + + /** + * 月份 1-12 + */ + private Long month; + + /** + * 地市编码 + */ + private String cityCode; + + /** + * 级别:1-市 2-区 3-街道 + */ + private Integer level; +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardCheckRegisterDomainBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardCheckRegisterDomainBo.java new file mode 100644 index 00000000..8a1475bc --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardCheckRegisterDomainBo.java @@ -0,0 +1,162 @@ +package com.zdxt.enforcementcode.domain.bo; + + +import com.zdxt.enforcementcode.domain.bean.DashboardCheckRegisterDomain; +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_check_register_domain + * + * @author Lion Li + * @date 2026-06-02 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = DashboardCheckRegisterDomain.class, reverseConvertGenerate = false) +public class DashboardCheckRegisterDomainBo extends BaseEntity { + + /** + * 主键ID + */ + @NotBlank(message = "主键ID不能为空", groups = { EditGroup.class }) + private String id; + + /** + * 年份 + */ + @NotNull(message = "年份不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long year; + + /** + * 月份 1-12 + */ + @NotNull(message = "月份 1-12不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long month; + + /** + * 领域ID + */ + @NotBlank(message = "领域ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private String lyid; + + /** + * 领域名称 + */ + @NotBlank(message = "领域名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String lymc; + + /** + * 执法单位ID + */ + @NotBlank(message = "执法单位ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private String zfdwid; + + /** + * 执法单位名称 + */ + @NotBlank(message = "执法单位名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String zfdwmc; + + /** + * 涉企检查总数 + */ + private Long sqjczs; + + /** + * 涉企检查同比% + */ + private Long sqjctb; + + /** + * 涉企检查环比% + */ + private Long sqjchb; + + /** + * 行政检查总数 + */ + private Long xzjczs; + + /** + * 行政检查同比% + */ + private Long xzjctb; + + /** + * 行政检查环比% + */ + private Long xzjchb; + + /** + * 行政处罚总数 + */ + private Long xzcfzs; + + /** + * 行政处罚同比% + */ + private Long xzcftb; + + /** + * 行政处罚环比% + */ + private Long xzcfhb; + + /** + * 行政强制总数 + */ + private Long xzzqzs; + + /** + * 行政强制同比% + */ + private Long xzzqtb; + + /** + * 行政强制环比% + */ + private Long xzzqhb; + + /** + * 其他执法总数 + */ + private Long qtzfzs; + + /** + * 其他执法同比% + */ + private Long qtzftb; + + /** + * 其他执法环比% + */ + private Long qtzfhb; + + /** + * 逻辑删除:0-否 1-是 + */ + private String isDelete; + + /** + * 局级部门ID + */ + private String bureauDeptId; + + /** + * 部门ID + */ + private String deptId; + + /** + * 组织单位ID + */ + private String organId; + + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardCheckRegisterDomainQueryBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardCheckRegisterDomainQueryBo.java new file mode 100644 index 00000000..cdc77156 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/DashboardCheckRegisterDomainQueryBo.java @@ -0,0 +1,32 @@ +package com.zdxt.enforcementcode.domain.bo; + + +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; + +import java.io.Serializable; + +/** + * 大屏-检查登记-领域统计业务对象 dashboard_check_register_domain + * + * @author Lion Li + * @date 2026-06-02 + */ +@Data +public class DashboardCheckRegisterDomainQueryBo implements Serializable { + + + /** + * 年份 + */ + private Long year; + + /** + * 月份 1-12 + */ + private Long month; + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardCheckRegisterAreaInfoVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardCheckRegisterAreaInfoVo.java new file mode 100644 index 00000000..8cd94ee5 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardCheckRegisterAreaInfoVo.java @@ -0,0 +1,37 @@ +package com.zdxt.enforcementcode.domain.vo; + + +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import com.zdxt.enforcementcode.domain.bean.DashboardCheckRegisterArea; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; + + +/** + * 大屏-检查登记-区域统计视图对象 dashboard_check_register_area + * + * @author Lion Li + * @date 2026-06-02 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DashboardCheckRegisterArea.class) +public class DashboardCheckRegisterAreaInfoVo implements Serializable { + + /** + * 总体概览 + */ + private DashboardCheckRegisterAreaVo totalCheckRegisterAreaInfo; + + + /** + * 各区域行政执法数据明细对比表 + */ + private List checkRegisterAreaList; + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardCheckRegisterAreaVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardCheckRegisterAreaVo.java new file mode 100644 index 00000000..7378f506 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardCheckRegisterAreaVo.java @@ -0,0 +1,205 @@ +package com.zdxt.enforcementcode.domain.vo; + + +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import com.zdxt.enforcementcode.domain.bean.DashboardCheckRegisterArea; +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_check_register_area + * + * @author Lion Li + * @date 2026-06-02 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DashboardCheckRegisterArea.class) +public class DashboardCheckRegisterAreaVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private String id; + + /** + * 年份 + */ + @ExcelProperty(value = "年份") + private Long year; + + /** + * 月份 1-12 + */ + @ExcelProperty(value = "月份 1-12") + private Long month; + + /** + * 地市编码 + */ + @ExcelProperty(value = "地市编码") + private String cityCode; + + /** + * 地市名称 + */ + @ExcelProperty(value = "地市名称") + private String cityName; + + /** + * 区县编码 + */ + @ExcelProperty(value = "区县编码") + private String areaCode; + + /** + * 区县名称 + */ + @ExcelProperty(value = "区县名称") + private String areaName; + + /** + * 级别:1-市 2-区 3-街道 + */ + private Integer level; + /** + * 涉企检查总数 + */ + @ExcelProperty(value = "涉企检查总数") + private Long sqjczs; + + /** + * 涉企检查同比% + */ + @ExcelProperty(value = "涉企检查同比%") + private Long sqjctb; + + /** + * 涉企检查环比% + */ + @ExcelProperty(value = "涉企检查环比%") + private Long sqjchb; + + /** + * 行政检查总数 + */ + @ExcelProperty(value = "行政检查总数") + private Long xzjczs; + + /** + * 行政检查同比% + */ + @ExcelProperty(value = "行政检查同比%") + private Long xzjctb; + + /** + * 行政检查环比% + */ + @ExcelProperty(value = "行政检查环比%") + private Long xzjchb; + + /** + * 行政处罚总数 + */ + @ExcelProperty(value = "行政处罚总数") + private Long xzcfzs; + + /** + * 行政处罚同比% + */ + @ExcelProperty(value = "行政处罚同比%") + private Long xzcftb; + + /** + * 行政处罚环比% + */ + @ExcelProperty(value = "行政处罚环比%") + private Long xzcfhb; + + /** + * 行政强制总数 + */ + @ExcelProperty(value = "行政强制总数") + private Long xzzqzs; + + /** + * 行政强制同比% + */ + @ExcelProperty(value = "行政强制同比%") + private Long xzzqtb; + + /** + * 行政强制环比% + */ + @ExcelProperty(value = "行政强制环比%") + private Long xzzqhb; + + /** + * 其他执法总数 + */ + @ExcelProperty(value = "其他执法总数") + private Long qtzfzs; + + /** + * 其他执法同比% + */ + @ExcelProperty(value = "其他执法同比%") + private Long qtzftb; + + /** + * 其他执法环比% + */ + @ExcelProperty(value = "其他执法环比%") + private Long qtzfhb; + + /** + * 单独执法总数 + */ + @ExcelProperty(value = "单独执法总数") + private Long ddzfzs; + + /** + * 联合执法总数 + */ + @ExcelProperty(value = "联合执法总数") + private Long lhzfzs; + + /** + * 逻辑删除:0-否 1-是 + */ + @ExcelProperty(value = "逻辑删除:0-否 1-是") + private String isDelete; + + /** + * 局级部门ID + */ + @ExcelProperty(value = "局级部门ID") + private String bureauDeptId; + + /** + * 部门ID + */ + @ExcelProperty(value = "部门ID") + private String deptId; + + /** + * 组织单位ID + */ + @ExcelProperty(value = "组织单位ID") + private String organId; + + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardCheckRegisterDomainInfoVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardCheckRegisterDomainInfoVo.java new file mode 100644 index 00000000..841ad39e --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardCheckRegisterDomainInfoVo.java @@ -0,0 +1,27 @@ +package com.zdxt.enforcementcode.domain.vo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +/** + * 大屏-检查登记-领域统计视图对象 dashboard_check_register_domain + * + * @author Lion Li + * @date 2026-06-02 + */ +@Data +public class DashboardCheckRegisterDomainInfoVo implements Serializable { + + /** + * 总体概览 + */ + private DashboardCheckRegisterDomainVo totalRegisterDomain; + + /** + * 领域统计 + */ + private List registerDomainList; +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardCheckRegisterDomainVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardCheckRegisterDomainVo.java new file mode 100644 index 00000000..46e51f5f --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/DashboardCheckRegisterDomainVo.java @@ -0,0 +1,188 @@ +package com.zdxt.enforcementcode.domain.vo; + +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import com.zdxt.enforcementcode.domain.bean.DashboardCheckRegisterDomain; +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_check_register_domain + * + * @author Lion Li + * @date 2026-06-02 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = DashboardCheckRegisterDomain.class) +public class DashboardCheckRegisterDomainVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private String id; + + /** + * 年份 + */ + @ExcelProperty(value = "年份") + private Long year; + + /** + * 月份 1-12 + */ + @ExcelProperty(value = "月份 1-12") + private Long month; + + /** + * 领域ID + */ + @ExcelProperty(value = "领域ID") + private String lyid; + + /** + * 领域名称 + */ + @ExcelProperty(value = "领域名称") + private String lymc; + + /** + * 执法单位ID + */ + @ExcelProperty(value = "执法单位ID") + private String zfdwid; + + /** + * 执法单位名称 + */ + @ExcelProperty(value = "执法单位名称") + private String zfdwmc; + + /** + * 涉企检查总数 + */ + @ExcelProperty(value = "涉企检查总数") + private Long sqjczs; + + /** + * 涉企检查同比% + */ + @ExcelProperty(value = "涉企检查同比%") + private Long sqjctb; + + /** + * 涉企检查环比% + */ + @ExcelProperty(value = "涉企检查环比%") + private Long sqjchb; + + /** + * 行政检查总数 + */ + @ExcelProperty(value = "行政检查总数") + private Long xzjczs; + + /** + * 行政检查同比% + */ + @ExcelProperty(value = "行政检查同比%") + private Long xzjctb; + + /** + * 行政检查环比% + */ + @ExcelProperty(value = "行政检查环比%") + private Long xzjchb; + + /** + * 行政处罚总数 + */ + @ExcelProperty(value = "行政处罚总数") + private Long xzcfzs; + + /** + * 行政处罚同比% + */ + @ExcelProperty(value = "行政处罚同比%") + private Long xzcftb; + + /** + * 行政处罚环比% + */ + @ExcelProperty(value = "行政处罚环比%") + private Long xzcfhb; + + /** + * 行政强制总数 + */ + @ExcelProperty(value = "行政强制总数") + private Long xzzqzs; + + /** + * 行政强制同比% + */ + @ExcelProperty(value = "行政强制同比%") + private Long xzzqtb; + + /** + * 行政强制环比% + */ + @ExcelProperty(value = "行政强制环比%") + private Long xzzqhb; + + /** + * 其他执法总数 + */ + @ExcelProperty(value = "其他执法总数") + private Long qtzfzs; + + /** + * 其他执法同比% + */ + @ExcelProperty(value = "其他执法同比%") + private Long qtzftb; + + /** + * 其他执法环比% + */ + @ExcelProperty(value = "其他执法环比%") + private Long qtzfhb; + + /** + * 逻辑删除:0-否 1-是 + */ + @ExcelProperty(value = "逻辑删除:0-否 1-是") + private String isDelete; + + /** + * 局级部门ID + */ + @ExcelProperty(value = "局级部门ID") + private String bureauDeptId; + + /** + * 部门ID + */ + @ExcelProperty(value = "部门ID") + private String deptId; + + /** + * 组织单位ID + */ + @ExcelProperty(value = "组织单位ID") + private String organId; + + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterAreaMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterAreaMapper.java new file mode 100644 index 00000000..d284533d --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterAreaMapper.java @@ -0,0 +1,36 @@ +package com.zdxt.enforcementcode.mapper; + + +import com.zdxt.enforcementcode.domain.bean.DashboardCheckRegisterArea; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterAreaVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 大屏-检查登记-区域统计Mapper接口 + * + * @author Lion Li + * @date 2026-06-02 + */ +public interface DashboardCheckRegisterAreaMapper extends BaseMapperPlus { + + /** + * 查询总体概览数据(市级level=1) + * + * @param year 年份 + * @param month 月份 + * @param cityCode 城市编码 + * @return 总体概览数据 + */ + DashboardCheckRegisterAreaVo queryTotalCheckRegisterAreaInfo(Long year, Long month, String cityCode); + + /** + * 查询各区域行政执法数据明细对比表(区级level=2) + * + * @param year 年份 + * @param month 月份 + * @param cityCode 城市编码 + * @return 区域数据列表 + */ + java.util.List queryCheckRegisterAreaList(Long year, Long month, String cityCode); + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterDomainMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterDomainMapper.java new file mode 100644 index 00000000..9dbfab05 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/DashboardCheckRegisterDomainMapper.java @@ -0,0 +1,36 @@ +package com.zdxt.enforcementcode.mapper; + + +import com.zdxt.enforcementcode.domain.bean.DashboardCheckRegisterDomain; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterDomainVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +import java.util.List; + +/** + * 大屏-检查登记-领域统计Mapper接口 + * + * @author Lion Li + * @date 2026-06-02 + */ +public interface DashboardCheckRegisterDomainMapper extends BaseMapperPlus { + + /** + * 查询总体概览数据 + * + * @param year 年份 + * @param month 月份 + * @return 总体概览数据 + */ + DashboardCheckRegisterDomainVo queryTotalRegisterDomain(Long year, Long month); + + /** + * 查询领域统计列表 + * + * @param year 年份 + * @param month 月份 + * @return 领域统计列表 + */ + List queryRegisterDomainList(Long year, Long month); + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardCheckRegisterAreaService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardCheckRegisterAreaService.java new file mode 100644 index 00000000..f7c67d8e --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardCheckRegisterAreaService.java @@ -0,0 +1,79 @@ +package com.zdxt.enforcementcode.service; + +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterAreaVo; +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterAreaBo; +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterAreaQueryBo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterAreaInfoVo; +import org.dromara.common.core.domain.R; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 大屏-检查登记-区域统计Service接口 + * + * @author Lion Li + * @date 2026-06-02 + */ +public interface IDashboardCheckRegisterAreaService { + + /** + * 查询大屏-检查登记-区域统计 + * + * @param id 主键 + * @return 大屏-检查登记-区域统计 + */ + DashboardCheckRegisterAreaVo queryById(String id); + + /** + * 分页查询大屏-检查登记-区域统计列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 大屏-检查登记-区域统计分页列表 + */ + TableDataInfo queryPageList(DashboardCheckRegisterAreaBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的大屏-检查登记-区域统计列表 + * + * @param bo 查询条件 + * @return 大屏-检查登记-区域统计列表 + */ + List queryList(DashboardCheckRegisterAreaBo bo); + + /** + * 查询大屏-检查登记-区域统计信息(包含总体概览和区域明细) + * + * @param bo 查询条件 + * @return 大屏-检查登记-区域统计信息 + */ + R getCheckRegisterArea(DashboardCheckRegisterAreaQueryBo bo); + + /** + * 新增大屏-检查登记-区域统计 + * + * @param bo 大屏-检查登记-区域统计 + * @return 是否新增成功 + */ + Boolean insertByBo(DashboardCheckRegisterAreaBo bo); + + /** + * 修改大屏-检查登记-区域统计 + * + * @param bo 大屏-检查登记-区域统计 + * @return 是否修改成功 + */ + Boolean updateByBo(DashboardCheckRegisterAreaBo bo); + + /** + * 校验并批量删除大屏-检查登记-区域统计信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardCheckRegisterDomainService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardCheckRegisterDomainService.java new file mode 100644 index 00000000..43f2f64c --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IDashboardCheckRegisterDomainService.java @@ -0,0 +1,79 @@ +package com.zdxt.enforcementcode.service; + +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterDomainQueryBo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterDomainInfoVo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterDomainVo; +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterDomainBo; +import org.dromara.common.core.domain.R; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 大屏-检查登记-领域统计Service接口 + * + * @author Lion Li + * @date 2026-06-02 + */ +public interface IDashboardCheckRegisterDomainService { + + /** + * 查询大屏-检查登记-领域统计 + * + * @param id 主键 + * @return 大屏-检查登记-领域统计 + */ + DashboardCheckRegisterDomainVo queryById(String id); + + /** + * 分页查询大屏-检查登记-领域统计列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 大屏-检查登记-领域统计分页列表 + */ + TableDataInfo queryPageList(DashboardCheckRegisterDomainBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的大屏-检查登记-领域统计列表 + * + * @param bo 查询条件 + * @return 大屏-检查登记-领域统计列表 + */ + List queryList(DashboardCheckRegisterDomainBo bo); + + /** + * 查询大屏-检查登记-领域统计信息 + * + * @param bo 查询条件(年份、月份、城市编码) + * @return 领域统计信息(包含总体概览和领域列表) + */ + R getDomainInfo(DashboardCheckRegisterDomainQueryBo bo); + + /** + * 新增大屏-检查登记-领域统计 + * + * @param bo 大屏-检查登记-领域统计 + * @return 是否新增成功 + */ + Boolean insertByBo(DashboardCheckRegisterDomainBo bo); + + /** + * 修改大屏-检查登记-领域统计 + * + * @param bo 大屏-检查登记-领域统计 + * @return 是否修改成功 + */ + Boolean updateByBo(DashboardCheckRegisterDomainBo bo); + + /** + * 校验并批量删除大屏-检查登记-领域统计信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardCheckRegisterAreaServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardCheckRegisterAreaServiceImpl.java new file mode 100644 index 00000000..80d1fdc6 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardCheckRegisterAreaServiceImpl.java @@ -0,0 +1,192 @@ +package com.zdxt.enforcementcode.service.impl; + +import com.zdxt.enforcementcode.domain.bean.DashboardCheckRegisterArea; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterAreaBo; +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterAreaQueryBo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterAreaVo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterAreaInfoVo; +import com.zdxt.enforcementcode.mapper.DashboardCheckRegisterAreaMapper; +import com.zdxt.enforcementcode.service.IDashboardCheckRegisterAreaService; + +import java.time.LocalDate; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 大屏-检查登记-区域统计Service业务层处理 + * + * @author Lion Li + * @date 2026-06-02 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class DashboardCheckRegisterAreaServiceImpl implements IDashboardCheckRegisterAreaService { + + private final DashboardCheckRegisterAreaMapper baseMapper; + + /** + * 查询大屏-检查登记-区域统计 + * + * @param id 主键 + * @return 大屏-检查登记-区域统计 + */ + @Override + public DashboardCheckRegisterAreaVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询大屏-检查登记-区域统计列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 大屏-检查登记-区域统计分页列表 + */ + @Override + public TableDataInfo queryPageList(DashboardCheckRegisterAreaBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的大屏-检查登记-区域统计列表 + * + * @param bo 查询条件 + * @return 大屏-检查登记-区域统计列表 + */ + @Override + public List queryList(DashboardCheckRegisterAreaBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + /** + * 查询大屏-检查登记-区域统计信息(包含总体概览和区域明细) + * + * @param bo 查询条件 + * @return 大屏-检查登记-区域统计信息 + */ + @Override + public R getCheckRegisterArea(DashboardCheckRegisterAreaQueryBo bo) { + Long year = bo.getYear(); + Long month = bo.getMonth(); + + if (year == null || month == null) { + LocalDate lastMonth = LocalDate.now().minusMonths(1); + year = (long) lastMonth.getYear(); + month = (long) lastMonth.getMonthValue(); + } + + String cityCode = StringUtils.isNotBlank(bo.getCityCode()) ? bo.getCityCode() : ""; + + DashboardCheckRegisterAreaVo totalCheckRegisterAreaInfo = baseMapper.queryTotalCheckRegisterAreaInfo(year, month, cityCode); + + List checkRegisterAreaList = baseMapper.queryCheckRegisterAreaList(year, month, cityCode); + + DashboardCheckRegisterAreaInfoVo infoVo = new DashboardCheckRegisterAreaInfoVo(); + infoVo.setTotalCheckRegisterAreaInfo(totalCheckRegisterAreaInfo); + infoVo.setCheckRegisterAreaList(checkRegisterAreaList != null ? checkRegisterAreaList : Collections.emptyList()); + + return R.ok(infoVo); + } + + private LambdaQueryWrapper buildQueryWrapper(DashboardCheckRegisterAreaBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(DashboardCheckRegisterArea::getId); + lqw.eq(bo.getYear() != null, DashboardCheckRegisterArea::getYear, bo.getYear()); + lqw.eq(bo.getMonth() != null, DashboardCheckRegisterArea::getMonth, bo.getMonth()); + lqw.eq(StringUtils.isNotBlank(bo.getCityCode()), DashboardCheckRegisterArea::getCityCode, bo.getCityCode()); + lqw.like(StringUtils.isNotBlank(bo.getCityName()), DashboardCheckRegisterArea::getCityName, bo.getCityName()); + lqw.eq(StringUtils.isNotBlank(bo.getAreaCode()), DashboardCheckRegisterArea::getAreaCode, bo.getAreaCode()); + lqw.like(StringUtils.isNotBlank(bo.getAreaName()), DashboardCheckRegisterArea::getAreaName, bo.getAreaName()); + lqw.eq(bo.getLevel() != null, DashboardCheckRegisterArea::getLevel, bo.getLevel()); + lqw.eq(bo.getSqjczs() != null, DashboardCheckRegisterArea::getSqjczs, bo.getSqjczs()); + lqw.eq(bo.getSqjctb() != null, DashboardCheckRegisterArea::getSqjctb, bo.getSqjctb()); + lqw.eq(bo.getSqjchb() != null, DashboardCheckRegisterArea::getSqjchb, bo.getSqjchb()); + lqw.eq(bo.getXzjczs() != null, DashboardCheckRegisterArea::getXzjczs, bo.getXzjczs()); + lqw.eq(bo.getXzjctb() != null, DashboardCheckRegisterArea::getXzjctb, bo.getXzjctb()); + lqw.eq(bo.getXzjchb() != null, DashboardCheckRegisterArea::getXzjchb, bo.getXzjchb()); + lqw.eq(bo.getXzcfzs() != null, DashboardCheckRegisterArea::getXzcfzs, bo.getXzcfzs()); + lqw.eq(bo.getXzcftb() != null, DashboardCheckRegisterArea::getXzcftb, bo.getXzcftb()); + lqw.eq(bo.getXzcfhb() != null, DashboardCheckRegisterArea::getXzcfhb, bo.getXzcfhb()); + lqw.eq(bo.getXzzqzs() != null, DashboardCheckRegisterArea::getXzzqzs, bo.getXzzqzs()); + lqw.eq(bo.getXzzqtb() != null, DashboardCheckRegisterArea::getXzzqtb, bo.getXzzqtb()); + lqw.eq(bo.getXzzqhb() != null, DashboardCheckRegisterArea::getXzzqhb, bo.getXzzqhb()); + lqw.eq(bo.getQtzfzs() != null, DashboardCheckRegisterArea::getQtzfzs, bo.getQtzfzs()); + lqw.eq(bo.getQtzftb() != null, DashboardCheckRegisterArea::getQtzftb, bo.getQtzftb()); + lqw.eq(bo.getQtzfhb() != null, DashboardCheckRegisterArea::getQtzfhb, bo.getQtzfhb()); + lqw.eq(bo.getDdzfzs() != null, DashboardCheckRegisterArea::getDdzfzs, bo.getDdzfzs()); + lqw.eq(bo.getLhzfzs() != null, DashboardCheckRegisterArea::getLhzfzs, bo.getLhzfzs()); + lqw.eq(StringUtils.isNotBlank(bo.getIsDelete()), DashboardCheckRegisterArea::getIsDelete, bo.getIsDelete()); + lqw.eq(StringUtils.isNotBlank(bo.getBureauDeptId()), DashboardCheckRegisterArea::getBureauDeptId, bo.getBureauDeptId()); + lqw.eq(StringUtils.isNotBlank(bo.getDeptId()), DashboardCheckRegisterArea::getDeptId, bo.getDeptId()); + lqw.eq(StringUtils.isNotBlank(bo.getOrganId()), DashboardCheckRegisterArea::getOrganId, bo.getOrganId()); + return lqw; + } + + /** + * 新增大屏-检查登记-区域统计 + * + * @param bo 大屏-检查登记-区域统计 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DashboardCheckRegisterAreaBo bo) { + DashboardCheckRegisterArea add = MapstructUtils.convert(bo, DashboardCheckRegisterArea.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改大屏-检查登记-区域统计 + * + * @param bo 大屏-检查登记-区域统计 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DashboardCheckRegisterAreaBo bo) { + DashboardCheckRegisterArea update = MapstructUtils.convert(bo, DashboardCheckRegisterArea.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DashboardCheckRegisterArea entity){ + } + + /** + * 校验并批量删除大屏-检查登记-区域统计信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardCheckRegisterDomainServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardCheckRegisterDomainServiceImpl.java new file mode 100644 index 00000000..006a1c82 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardCheckRegisterDomainServiceImpl.java @@ -0,0 +1,192 @@ +package com.zdxt.enforcementcode.service.impl; + +import com.zdxt.enforcementcode.domain.bean.DashboardCheckRegisterDomain; +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterDomainQueryBo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterDomainInfoVo; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.zdxt.enforcementcode.domain.bo.DashboardCheckRegisterDomainBo; +import com.zdxt.enforcementcode.domain.vo.DashboardCheckRegisterDomainVo; + +import com.zdxt.enforcementcode.mapper.DashboardCheckRegisterDomainMapper; +import com.zdxt.enforcementcode.service.IDashboardCheckRegisterDomainService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 大屏-检查登记-领域统计Service业务层处理 + * + * @author Lion Li + * @date 2026-06-02 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class DashboardCheckRegisterDomainServiceImpl implements IDashboardCheckRegisterDomainService { + + private final DashboardCheckRegisterDomainMapper baseMapper; + + /** + * 查询大屏-检查登记-领域统计 + * + * @param id 主键 + * @return 大屏-检查登记-领域统计 + */ + @Override + public DashboardCheckRegisterDomainVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询大屏-检查登记-领域统计列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 大屏-检查登记-领域统计分页列表 + */ + @Override + public TableDataInfo queryPageList(DashboardCheckRegisterDomainBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的大屏-检查登记-领域统计列表 + * + * @param bo 查询条件 + * @return 大屏-检查登记-领域统计列表 + */ + @Override + public List queryList(DashboardCheckRegisterDomainBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(DashboardCheckRegisterDomainBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(DashboardCheckRegisterDomain::getId); + lqw.eq(bo.getYear() != null, DashboardCheckRegisterDomain::getYear, bo.getYear()); + lqw.eq(bo.getMonth() != null, DashboardCheckRegisterDomain::getMonth, bo.getMonth()); + lqw.eq(StringUtils.isNotBlank(bo.getLyid()), DashboardCheckRegisterDomain::getLyid, bo.getLyid()); + lqw.eq(StringUtils.isNotBlank(bo.getLymc()), DashboardCheckRegisterDomain::getLymc, bo.getLymc()); + lqw.eq(StringUtils.isNotBlank(bo.getZfdwid()), DashboardCheckRegisterDomain::getZfdwid, bo.getZfdwid()); + lqw.eq(StringUtils.isNotBlank(bo.getZfdwmc()), DashboardCheckRegisterDomain::getZfdwmc, bo.getZfdwmc()); + lqw.eq(bo.getSqjczs() != null, DashboardCheckRegisterDomain::getSqjczs, bo.getSqjczs()); + lqw.eq(bo.getSqjctb() != null, DashboardCheckRegisterDomain::getSqjctb, bo.getSqjctb()); + lqw.eq(bo.getSqjchb() != null, DashboardCheckRegisterDomain::getSqjchb, bo.getSqjchb()); + lqw.eq(bo.getXzjczs() != null, DashboardCheckRegisterDomain::getXzjczs, bo.getXzjczs()); + lqw.eq(bo.getXzjctb() != null, DashboardCheckRegisterDomain::getXzjctb, bo.getXzjctb()); + lqw.eq(bo.getXzjchb() != null, DashboardCheckRegisterDomain::getXzjchb, bo.getXzjchb()); + lqw.eq(bo.getXzcfzs() != null, DashboardCheckRegisterDomain::getXzcfzs, bo.getXzcfzs()); + lqw.eq(bo.getXzcftb() != null, DashboardCheckRegisterDomain::getXzcftb, bo.getXzcftb()); + lqw.eq(bo.getXzcfhb() != null, DashboardCheckRegisterDomain::getXzcfhb, bo.getXzcfhb()); + lqw.eq(bo.getXzzqzs() != null, DashboardCheckRegisterDomain::getXzzqzs, bo.getXzzqzs()); + lqw.eq(bo.getXzzqtb() != null, DashboardCheckRegisterDomain::getXzzqtb, bo.getXzzqtb()); + lqw.eq(bo.getXzzqhb() != null, DashboardCheckRegisterDomain::getXzzqhb, bo.getXzzqhb()); + lqw.eq(bo.getQtzfzs() != null, DashboardCheckRegisterDomain::getQtzfzs, bo.getQtzfzs()); + lqw.eq(bo.getQtzftb() != null, DashboardCheckRegisterDomain::getQtzftb, bo.getQtzftb()); + lqw.eq(bo.getQtzfhb() != null, DashboardCheckRegisterDomain::getQtzfhb, bo.getQtzfhb()); + lqw.eq(StringUtils.isNotBlank(bo.getIsDelete()), DashboardCheckRegisterDomain::getIsDelete, bo.getIsDelete()); + lqw.eq(StringUtils.isNotBlank(bo.getBureauDeptId()), DashboardCheckRegisterDomain::getBureauDeptId, bo.getBureauDeptId()); + lqw.eq(StringUtils.isNotBlank(bo.getDeptId()), DashboardCheckRegisterDomain::getDeptId, bo.getDeptId()); + lqw.eq(StringUtils.isNotBlank(bo.getOrganId()), DashboardCheckRegisterDomain::getOrganId, bo.getOrganId()); + return lqw; + } + + /** + * 新增大屏-检查登记-领域统计 + * + * @param bo 大屏-检查登记-领域统计 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(DashboardCheckRegisterDomainBo bo) { + DashboardCheckRegisterDomain add = MapstructUtils.convert(bo, DashboardCheckRegisterDomain.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改大屏-检查登记-领域统计 + * + * @param bo 大屏-检查登记-领域统计 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(DashboardCheckRegisterDomainBo bo) { + DashboardCheckRegisterDomain update = MapstructUtils.convert(bo, DashboardCheckRegisterDomain.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(DashboardCheckRegisterDomain entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 查询大屏-检查登记-领域统计信息 + * + * @param bo 查询条件 + * @return 领域统计信息 + */ + @Override + public R getDomainInfo(DashboardCheckRegisterDomainQueryBo bo) { + Long year = bo.getYear(); + Long month = bo.getMonth(); + + // 如果年份或月份为空,默认查询上个月数据 + if (year == null || month == null) { + java.time.LocalDate lastMonth = java.time.LocalDate.now().minusMonths(1); + year = (long) lastMonth.getYear(); + month = (long) lastMonth.getMonthValue(); + } + + // 查询总体概览数据 + DashboardCheckRegisterDomainVo totalRegisterDomain = baseMapper.queryTotalRegisterDomain(year, month); + + // 查询领域统计列表 + List registerDomainList = baseMapper.queryRegisterDomainList(year, month); + + // 组装返回结果 + DashboardCheckRegisterDomainInfoVo infoVo = new DashboardCheckRegisterDomainInfoVo(); + infoVo.setTotalRegisterDomain(totalRegisterDomain); + infoVo.setRegisterDomainList(registerDomainList); + + return R.ok(infoVo); + } + + /** + * 校验并批量删除大屏-检查登记-领域统计信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterAreaMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterAreaMapper.xml new file mode 100644 index 00000000..3c2d416c --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterAreaMapper.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterDomainMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterDomainMapper.xml new file mode 100644 index 00000000..08c86f39 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardCheckRegisterDomainMapper.xml @@ -0,0 +1,69 @@ + + + + + + + + + + +