From 95520f3bb5f341accb06a9802fecad55345e7dc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E7=88=B1=E5=AD=A6=E4=B9=A0=E7=9A=84=E7=9F=B3?=
 =?UTF-8?q?=E5=90=8C=E5=AD=A6?= <2936013465@qq.com>
Date: Fri, 27 Dec 2024 17:50:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datav/DataVCaseVerifController.java       |  4 +--
 .../SubOneSupervisionNotifyController.java    |  2 +-
 .../mapper/SupExternalDepartMapper.java       |  3 +++
 .../service/BusinessDepartService.java        | 27 ++++++++++++-------
 .../service/BusinessPoliceService.java        |  6 +++++
 5 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java
index 8b9380b..e4a8810 100644
--- a/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java
+++ b/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java
@@ -83,7 +83,7 @@ public class DataVCaseVerifController {
      * @param endTime   结束时间
      * @return Result<JSONObject>
      */
-    @GetMapping("/getAllCaseVerificationCount")
+    @GetMapping("/getCaseVerificationCount")
     public Result<JSONObject> getAllCaseVerificationCount(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
                                                           @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
         CaseVerificationCountVo overview =  negativeMapper.getAllCaseVerificationCount(beginTime, endTime);
@@ -161,8 +161,6 @@ public class DataVCaseVerifController {
                 .fluentPut("tzclList", tzclList);
         return Result.success(data);
     }
-
-
     // endregion
 
 
diff --git a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneSupervisionNotifyController.java b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneSupervisionNotifyController.java
index bfead25..d58fd96 100644
--- a/src/main/java/com/biutag/supervision/controller/subdatav/SubOneSupervisionNotifyController.java
+++ b/src/main/java/com/biutag/supervision/controller/subdatav/SubOneSupervisionNotifyController.java
@@ -89,7 +89,7 @@ public class SubOneSupervisionNotifyController {
      * @return
      */
     @Operation(summary = "大屏中央总览数据")
-    @GetMapping("/getAllSubOneSupervisionNotifyCount")
+    @GetMapping("/getSubOneSupervisionNotifyCount")
     public Result<JSONObject> getAllSubOneSupervisionNotifyCount(@RequestParam Integer departId,
                                                                  @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
                                                                  @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
diff --git a/src/main/java/com/biutag/supervision/mapper/SupExternalDepartMapper.java b/src/main/java/com/biutag/supervision/mapper/SupExternalDepartMapper.java
index 8a650eb..aca738e 100644
--- a/src/main/java/com/biutag/supervision/mapper/SupExternalDepartMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/SupExternalDepartMapper.java
@@ -7,6 +7,9 @@ import org.apache.ibatis.annotations.Select;
 import java.util.List;
 import java.util.Map;
 
+/**
+ * 外部单位表
+ */
 public interface SupExternalDepartMapper extends BaseMapper<SupExternalDepart> {
 
     @Select("<script>"
diff --git a/src/main/java/com/biutag/supervision/service/BusinessDepartService.java b/src/main/java/com/biutag/supervision/service/BusinessDepartService.java
index 1c70c01..d7d226d 100644
--- a/src/main/java/com/biutag/supervision/service/BusinessDepartService.java
+++ b/src/main/java/com/biutag/supervision/service/BusinessDepartService.java
@@ -107,41 +107,48 @@ public class BusinessDepartService extends ServiceImpl<BusinessDepartMapper, Bus
 
     public void generate(List<Date> happenTime) {
         List<BusinessDepart> businessDepartList = new ArrayList<>();
-        List<GBaseJJD> gBaseJJDSList = selectJJDList(happenTime);
-        List<GBaseAJJBXX> gBaseAJJBXXListSA = selectAJJBXX(1, happenTime);
-        List<GBaseAJJBXX> gBaseAJJBXXListLA = selectAJJBXX(2, happenTime);
-        List<GBaseAJJBXX> gBaseAJJBXXListPA = selectAJJBXX(3, happenTime);
+        List<GBaseJJD> gBaseJJDSList = selectJJDList(happenTime);   // 接警单，除去无效、其他等案件
+        List<GBaseAJJBXX> gBaseAJJBXXListSA = selectAJJBXX(1, happenTime);  // 受理日期
+        List<GBaseAJJBXX> gBaseAJJBXXListLA = selectAJJBXX(2, happenTime);  // 立案日期
+        List<GBaseAJJBXX> gBaseAJJBXXListPA = selectAJJBXX(3, happenTime);  // 破案日期
+        // 为空就不执行，记录日志
         if (gBaseJJDSList.isEmpty() && gBaseAJJBXXListSA.isEmpty() && gBaseAJJBXXListLA.isEmpty() && gBaseAJJBXXListPA.isEmpty()) {
             businessLogMapper.insert(new BusinessLog().setType("单位业务数据").setNum(0).setCreateTime(LocalDateTime.now()));
             log.info("{}没有单位数据", happenTime.get(0));
             return;
         }
         List<String> departIds = new ArrayList<>();
+        // 获取管辖单位代码
         generateDepartIds(gBaseJJDSList, departIds, gBaseAJJBXXListSA, gBaseAJJBXXListLA, gBaseAJJBXXListPA);
         if (departIds.isEmpty()) {
             return;
         }
-        List<Map<String, Object>> idsByDepartIds = supExternalDepartMapper.getIdsByDepartIds(departIds);// 430100221100-1011
+        // 关联表获取单位id和内部id  例如：430105424500——13365   湖南省长沙市公安局开福分局望麓园派出所五中队——（湖南省长沙市公安局开福分局望麓园派出所五中队）望麓园所五中队
+        List<Map<String, Object>> idsByDepartIds = supExternalDepartMapper.getIdsByDepartIds(departIds);//
+        // 单位ID的映射：430100221100-1011(内部ID)
         Map<String, String> resultMap2 = idsByDepartIds.stream().filter(map -> map.get("external_id") != null).collect(Collectors.toMap(
                 map -> (String) map.get("external_id"),
                 map -> map.get("internal_id") == null ? "" : (String) map.get("internal_id")
         ));
-        List<String> values = resultMap2.values().stream().filter(Objects::nonNull).toList();// 1011
+        List<String> values = resultMap2.values().stream().filter(Objects::nonNull).toList();// 去空
+        // 单位短名的映射：430100221100-望麓园所五中队(这是内部短名)
         Map<String, String> resultMap3 = idsByDepartIds.stream().filter(map -> map.get("external_id") != null).collect(Collectors.toMap(
                 map -> (String) map.get("external_id"),
                 map -> map.get("internal_short_name") == null ? "" : (String) map.get("internal_short_name")
         ));
-        List<Map<String, Object>> resultList = new ArrayList<>();
+        List<Map<String, Object>> resultList = new ArrayList<>();  // 分组：  长沙县局ID：xxx派出所ID、xxx派出所ID
         if (!values.isEmpty()) {
             resultList = statisticsDepartMapper.getGroupIdsByDepartIds(values);
         }
-        if (resultList.isEmpty()) {
+        if (resultList.isEmpty()) {  // 如果没有查到ID，则不执行插入操作
             businessLogMapper.insert(new BusinessLog().setType("单位业务数据").setNum(0).setCreateTime(LocalDateTime.now()));
             log.info("{}没有单位数据", happenTime.get(0));
             return;
         }
+        // 分组ID的映射：xxx(内部ID)——长沙县局ID
         Map<String, Long> resultMap = resultList.stream().collect(Collectors.toMap(map -> (String) map.get("departId"), map -> (Long) map.get("groupId")));
         List<Long> groupIds = new ArrayList<>();
+        // 映射成是我们单位的数据
         generateBusinessDepartList(happenTime, gBaseJJDSList, resultMap, resultMap2, resultMap3, groupIds, businessDepartList, gBaseAJJBXXListSA, gBaseAJJBXXListLA, gBaseAJJBXXListPA);
         List<Map<Long, Object>> nameList = statisticsGroupMapper.getNameByGroupIds(groupIds);
         Map<Long, String> names = nameList.stream().collect(Collectors.toMap(map -> (Long) map.get("groupId"), map -> (String) map.get("name")));
@@ -253,8 +260,8 @@ public class BusinessDepartService extends ServiceImpl<BusinessDepartMapper, Bus
     public List<GBaseJJD> selectJJDList(List<Date> happenTime) {
         QueryWrapper<GBaseJJD> queryWrapper = new QueryWrapper<>();
         queryWrapper.between("cjsj", happenTime.get(0), happenTime.get(1));
-        queryWrapper.notLikeRight("jqxzdm", "11");
-        queryWrapper.notLikeRight("jqxzdm", "99");
+        queryWrapper.notLikeRight("jqxzdm", "11");   // 其他业务
+        queryWrapper.notLikeRight("jqxzdm", "99");  // 无效、重复报警等
         queryWrapper.groupBy("gxdwdm", "gxdwmc");
         return gBaseJJDMapper.selectJJDList(queryWrapper);
     }
diff --git a/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java b/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java
index fb38905..c4c65c8 100644
--- a/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java
+++ b/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java
@@ -89,20 +89,25 @@ public class BusinessPoliceService extends ServiceImpl<BusinessPoliceMapper, Bus
         List<GBaseCJD> gBaseCJDSList = selectCJDList(happenTime);
         // 执法办案
         ZFBAResult zfbaresult = getZfbaResult(happenTime);
+        // 如果所有数据列表都为空，记录日志并返回
         if (gBaseCJDSList.isEmpty() && zfbaresult.bar1().isEmpty() && zfbaresult.bar2().isEmpty() && zfbaresult.bar3().isEmpty() && zfbaresult.bar4().isEmpty() && zfbaresult.bar5().isEmpty() && zfbaresult.bar6().isEmpty()) {
             log.info("{}没有个人数据", happenTime.get(0));
             businessLogMapper.insert(new BusinessLog().setType("个人业务数据").setNum(0).setCreateTime(LocalDateTime.now()));
             return;
         }
+        // 初始化三个映射，用于存储不同类型的案件信息
         Map<String, GBaseAJJBXX> gBaseAJJBXXMapSR = new HashMap<>();
         Map<String, GBaseAJJBXX> gBaseAJJBXXMapLR = new HashMap<>();
         Map<String, GBaseAJJBXX> gBaseAJJBXXMapPR = new HashMap<>();
+        // 生成案件信息的映射
         generateAJJBXXMap(zfbaresult, gBaseAJJBXXMapSR, gBaseAJJBXXMapLR, gBaseAJJBXXMapPR);
         List<String> departIds = new ArrayList<>();
+        // 生成管辖单位代码
         generateDepartIds(gBaseCJDSList, departIds, zfbaresult);
         if (departIds.isEmpty()) {
             return;
         }
+        // 通过管辖单位代码从数据库中获取单位 ID 和内部 ID和 内部名字
         List<Map<String, Object>> idsByDepartIds = supExternalDepartMapper.getIdsByDepartIds(departIds);// 430100221100-1011
         Map<String, String> resultMap2 = idsByDepartIds.stream().filter(map -> map.get("external_id") != null).collect(Collectors.toMap(
                         map -> (String) map.get("external_id"),
@@ -119,6 +124,7 @@ public class BusinessPoliceService extends ServiceImpl<BusinessPoliceMapper, Bus
                 map -> (Long) map.get("groupId")
         ));
         List<Long> groupIds = new ArrayList<>();
+
         generateBusinessPoliceList(happenTime, gBaseCJDSList, resultMap, resultMap2, resultMap3, groupIds, businessPoliceList, gBaseAJJBXXMapSR, gBaseAJJBXXMapLR, gBaseAJJBXXMapPR);
         List<Map<Long, Object>> nameList = statisticsGroupMapper.getNameByGroupIds(groupIds);
         Map<Long, String> names = nameList.stream().collect(Collectors.toMap(