优化大屏的逻辑

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<DashboardOverviewVo> getDpzl(QueryDashboardOverviewBo bo) {
+        DashboardOverviewVo result = dashboardOverviewService.getDashboardOverviewInfo(bo);
+        return R.ok(result);
+    }
+
+    /**
+     * 各区风险态势感知
+     */
+    @GetMapping("/querySituationTrendAreaList")
+    public R<List<DashboardSituationAreaVo>> querySituationTrendAreaList(@Validated DashboardTrendStatQueryBo bo) {
+        List<DashboardSituationAreaVo> list = dashboardSituationTrendAreaService.querySituationTrendAreaList(bo);
+        return R.ok(list);
+    }
+
+    /**
+     * 各领域风险态势感知
+     */
+    @GetMapping("/querySituationTrendDomainList")
+    public R<List<DashboardSituationDomainVo>> querySituationTrendDomainList(@Validated DashboardTrendStatQueryBo bo) {
+        List<DashboardSituationDomainVo> list = situationTrendDomainService.querySituationTrendDomainList(bo);
+        return R.ok(list);
+    }
+
+
+
+}

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-是
      */

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;

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-街道");
         }
 
         // 如果未指定年份和月份，默认查询当前年和上一个月

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'
 
         <if test="startYear != null and startQuarter != null and endYear != null and endQuarter != null">
@@ -44,7 +44,7 @@
         </if>
 
         ORDER BY
-            a.district_name,
+            b.sort,
             a.year,
             a.quarter
 

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'
 
         <if test="startYear != null and startQuarter != null and endYear != null and endQuarter != null">
@@ -46,7 +46,7 @@
         </if>
 
         ORDER BY
-            a.lymc,
+            b.sort,
             a.year,
             a.quarter
 

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'
         <if test="startYear != null and startQuarter != null and endYear != null and endQuarter != null">
             AND (
@@ -55,7 +55,7 @@
     <select id="areaQuarterDomainCheck" resultType="com.zdxt.enforcementcode.domain.vo.DashboardTrendStatVo">
         SELECT
         a.*
-        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'
         <if test="startYear != null and startQuarter != null and endYear != null and endQuarter != null">
             AND (
@@ -104,7 +104,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_domain_dept b on a.lyid = b.dept_id and b.level = 2
+        FROM dashboard_trend_stat a left join  dashboard_domain_dept b on a.lyid = b.dept_id and b.level = 3
         WHERE a.is_delete = '0'
         <if test="startYear != null and startQuarter != null and endYear != null and endQuarter != null">
             AND (

zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml

@@ -277,3 +277,50 @@ xss:
   excludeUrls:
     - /web/enforcementcode/educationServices/add
     - /web/enforcementcode/educationServices/edit
+
+
+#深i企对接密钥 测试环境
+siq:
+  #正式
+  siqUrl: ENC(Y8AuVzQ311FOgJ4h07zjkLH8ArJBED3Xxz3Ug0ncPzuLXIVCuB25DA==)
+  code: ENC(Ogi+/4PPtXiuILnVlNg4Lw==)
+  secretKey: ENC(zTr/tj2VgFxQyunI4eIL7NyRWDPSMPSB0VlwTYeHTdsEWyu1H96xWw==)
+  # 模拟数据开关（true=使用模拟数据，false=调用真实接口）
+  mock:
+    enabled: false
+#深圳易平台对接密钥
+szypt:
+  #正式
+  agentid: ENC(Z4ocLy7RavOPRp/9KJXTVQ==)
+  url: ENC(Ah5iP4HqMgtPPNzA0uVIWHUtZs54wieeJI62VoMTULoRvt6GQHW07m2ShFpNVXdi)
+  corpid: ENC(KZI8Psp0rqJJWcuxAHUMiCPfNhprw1XkfvJoANlHPCw=)
+  corpsecret: ENC(IkIsBn9u1XF+hqF3Vkke2j+nD2znwwMKGB1eHxiRF6Au13h1h0Opyn97teoap1sHxMcxJLK3T9k=)
+
+#市认证网关
+srnwg:
+  #正式
+  url: ENC(pHNm/o0+6S+HjrM5nuMiPRfkrHS1tXYD5i25OBtM4dWSi6MvH6iXfw==)
+  systemCode: ENC(cHDdxMKpJ/rbuj4PVCxylN+zPd9I2KT0)
+  integrationKey: ENC(txSndcPbZK5mYjW7Doa/n9Ips2PLa9NV)
+  paasId: szsfj_zhifajianduma_001
+  paasToken: ENC(VfUgR5OXHJcKvBBfq/2ysuNPH6I7tCCeWHYSzXKicGChlMiw9mVPGD51naX9w42E)
+  #市认证数据加密字符
+  secretKey: ENC(xWBA5VwT23j14A8+6I15HCerJvo3zaRxzVE2xc0i7wZ7wq/SCflOEkHCc8wwdi0KHkDGjKIoHhs=)
+
+#民生诉求
+mssq:
+  appId: 30cd632d18c24bc2b476535494327987
+  appKey: MzBjZDYzMmQxOGMyNGJjMmI0NzY1MzU0OTQzMjc5ODc6U3pzejIwMjQ=
+  apiUrl: http://10.224.158.101:8182/proxy/
+  hcpappid: zfjdm
+  hcpsign: 0460493a4493a06d4e4bf20df7495b36b019b311312b4fe305450a4bfd9cb8e5cba00ef71698f67cfc68247c4f43c7b71d0ec9d18b9d8f0b68ac048d8af563c8f8eff55a02f28cf524af9ff82b0e9d3e59bf750b3a1bb38b6dbb3f2075600b941aaa68317d882622734ed068bcb1b2e496b05991dcfc31169934a0805ef7abcf7371daff66ea
+  hcptimestamp: 20240801142433
+
+#短信平台
+sms:
+  account: 122
+  pwd: szsfj1800
+
+
+#市监代理页面
+sjView: http://10.132.108.3/sjWeb