diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppLawEnforcementOverviewController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppLawEnforcementOverviewController.java new file mode 100644 index 00000000..9f11a770 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppLawEnforcementOverviewController.java @@ -0,0 +1,67 @@ +package com.zdxt.enforcementcode.controller.app.enforcement; + +import com.zdxt.enforcementcode.domain.bo.DashboardTrendStatQueryBo; +import com.zdxt.enforcementcode.domain.bo.QueryDashboardOverviewBo; +import com.zdxt.enforcementcode.domain.vo.DashboardOverviewVo; +import com.zdxt.enforcementcode.domain.vo.DashboardSituationAreaVo; +import com.zdxt.enforcementcode.domain.vo.DashboardSituationDomainVo; +import com.zdxt.enforcementcode.service.IDashboardOverviewService; +import com.zdxt.enforcementcode.service.IDashboardSituationTrendAreaService; +import com.zdxt.enforcementcode.service.IDashboardSituationTrendDomainService; +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; + +import java.util.List; + +/** + * 移动监督端-执法总览 + * + * @author Lion Li + * @date 2026-05-27 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/app-enf/Law/enforcement/overview") +public class AppLawEnforcementOverviewController extends BaseController { + + private final IDashboardOverviewService dashboardOverviewService; + private final IDashboardSituationTrendDomainService situationTrendDomainService; + private final IDashboardSituationTrendAreaService dashboardSituationTrendAreaService; + + /** + * 查询大屏总览信息 + * 查询上一个月的数据 + */ + @GetMapping("/getDpzl") + public R getDpzl(QueryDashboardOverviewBo bo) { + DashboardOverviewVo result = dashboardOverviewService.getDashboardOverviewInfo(bo); + return R.ok(result); + } + + /** + * 各区风险态势感知 + */ + @GetMapping("/querySituationTrendAreaList") + public R> querySituationTrendAreaList(@Validated DashboardTrendStatQueryBo bo) { + List list = dashboardSituationTrendAreaService.querySituationTrendAreaList(bo); + return R.ok(list); + } + + /** + * 各领域风险态势感知 + */ + @GetMapping("/querySituationTrendDomainList") + public R> querySituationTrendDomainList(@Validated DashboardTrendStatQueryBo bo) { + List list = situationTrendDomainService.querySituationTrendDomainList(bo); + return R.ok(list); + } + + + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bean/DashboardOverview.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bean/DashboardOverview.java index 4de793bf..01488b1f 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bean/DashboardOverview.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bean/DashboardOverview.java @@ -152,21 +152,61 @@ public class DashboardOverview extends BaseEntity { */ private Long xzjc; + /** + * 行政检查同比 + */ + private java.math.BigDecimal xzjctb; + + /** + * 行政检查环比 + */ + private java.math.BigDecimal xzjchb; + /** * 行政处罚 */ private Long xzcf; + /** + * 行政处罚同比 + */ + private java.math.BigDecimal xzcftb; + + /** + * 行政处罚环比 + */ + private java.math.BigDecimal xzcfhb; + /** * 行政强制 */ private Long xzqz; + /** + * 行政强制同比 + */ + private java.math.BigDecimal xzqztb; + + /** + * 行政强制环比 + */ + private java.math.BigDecimal xzqzhb; + /** * 其他行政行为 */ private Long xzqt; + /** + * 其他行政行为同比 + */ + private java.math.BigDecimal xzqttb; + + /** + * 其他行政行为环比 + */ + private java.math.BigDecimal xzqthb; + /** * 执法人员数 */ @@ -267,6 +307,16 @@ public class DashboardOverview extends BaseEntity { */ private Long ycxwcs; + /** + * 高频检查企业数 + */ + private Long highFreqCompanyNum; + + /** + * 是否高频检查：0-否 1-是 + */ + private String isHighFreq; + /** * 逻辑删除：0-否 1-是 */ diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/QueryDashboardOverviewBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/QueryDashboardOverviewBo.java index cda2869f..7c361258 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/QueryDashboardOverviewBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/QueryDashboardOverviewBo.java @@ -55,7 +55,7 @@ public class QueryDashboardOverviewBo implements Serializable { private String streetName; /** - * 级别：1-市 2-区 3-街道 + * 级别：1-市 2-市直 3-区 4-街道 */ @NotNull(message = "级别不能为空") private Long level; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardOverviewServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardOverviewServiceImpl.java index 31274805..e1640186 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardOverviewServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/DashboardOverviewServiceImpl.java @@ -375,7 +375,7 @@ public class DashboardOverviewServiceImpl implements IDashboardOverviewService { public DashboardOverviewVo getDashboardOverviewInfo(QueryDashboardOverviewBo bo) { // 校验 level 参数不能为空 if (bo.getLevel() == null) { - throw new IllegalArgumentException("级别参数不能为空，级别：1-市 2-区 3-街道"); + throw new IllegalArgumentException("级别参数不能为空，级别：1-市 2-市直 3-区 4-街道"); } // 如果未指定年份和月份，默认查询当前年和上一个月 diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendAreaMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendAreaMapper.xml index b585916a..5fe441b0 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendAreaMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendAreaMapper.xml @@ -24,7 +24,7 @@ a.bureau_dept_id AS bureauDeptId, a.dept_id AS deptId, a.organ_id AS organId - FROM dashboard_situation_trend_area a + FROM dashboard_situation_trend_area a left join dashboard_area_info b on a.district_code = b.code and b.level = 3 WHERE a.is_delete = '0' @@ -44,7 +44,7 @@ ORDER BY - a.district_name, + b.sort, a.year, a.quarter diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendDomainMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendDomainMapper.xml index a973241d..a080118c 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendDomainMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardSituationTrendDomainMapper.xml @@ -26,7 +26,7 @@ a.bureau_dept_id AS bureauDeptId, a.dept_id AS deptId, a.organ_id AS organId - FROM dashboard_situation_trend_domain a + FROM dashboard_situation_trend_domain a left join dashboard_domain_dept b ON a.lyid = b.domain_id and b.`level` = 2 WHERE a.is_delete = '0' @@ -46,7 +46,7 @@ ORDER BY - a.lymc, + b.sort, a.year, a.quarter diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardTrendStatMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardTrendStatMapper.xml index 13e27b62..3bff6bcc 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardTrendStatMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/DashboardTrendStatMapper.xml @@ -19,7 +19,7 @@ IFNULL(SUM(a.dj_d), 0) AS djD, IFNULL(SUM(a.dj_e), 0) AS djE, IFNULL(SUM(a.wgcs), 0) AS wgcs - FROM dashboard_trend_stat a left join dashboard_area_info b on a.district_code = b.`code` and b.`level` = 2 + FROM dashboard_trend_stat a left join dashboard_area_info b on a.district_code = b.`code` and b.`level` = 3 WHERE a.is_delete = '0' AND ( @@ -55,7 +55,7 @@