From a02e2a40ef9aa22ecb193fe22a49a40b5fa187a8 Mon Sep 17 00:00:00 2001
From: sjh <shujiehao@foxmail.com>
Date: Tue, 29 Oct 2024 11:44:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E5=9F=BA=E7=A1=80=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=88=E6=89=A7=E6=B3=95=E5=8A=9E=E6=A1=88=E5=8F=97?=
 =?UTF-8?q?=E7=AB=8B=E7=A0=B4=E6=A1=88=E6=95=B0=E6=8D=AE=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BusinessDepartService.java        | 89 +++++++++----------
 .../service/BusinessPoliceService.java        | 13 ++-
 2 files changed, 48 insertions(+), 54 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/service/BusinessDepartService.java b/src/main/java/com/biutag/supervision/service/BusinessDepartService.java
index 4626bf3..10923bf 100644
--- a/src/main/java/com/biutag/supervision/service/BusinessDepartService.java
+++ b/src/main/java/com/biutag/supervision/service/BusinessDepartService.java
@@ -46,7 +46,8 @@ public class BusinessDepartService extends ServiceImpl<BusinessDepartMapper, Bus
     private final GBaseAJJBXXMapper gBaseAJJBXXMapper;
 
     public Page<BusinessPoliceModel> page(BusinessQueryParam businessQueryParam) {
-        if (businessQueryParam.getDepartName()!=null && businessQueryParam.getDepartName().equals("开始导入今年所有的数据")) {
+        // 测基础数据
+        if (businessQueryParam.getDepartName() != null && businessQueryParam.getDepartName().equals("开始导入今年所有的数据")) {
             LocalDate start = LocalDate.parse("2024-01-01");
             LocalDate end = LocalDate.parse("2024-10-31");
             for (LocalDate date = start; !date.isAfter(end); date = date.plusDays(1)) {
@@ -66,33 +67,19 @@ public class BusinessDepartService extends ServiceImpl<BusinessDepartMapper, Bus
             happenTime.add(end);
             generate(happenTime);
         }
-        if (businessQueryParam.getDepartName() != null && businessQueryParam.getDepartName().equals("运行测试1")) {
-            System.out.println("开始执行测试1");
-            modelClueService.generate(1);
-            System.out.println("测试1执行完毕");
-            return null;
-        }
-        if (businessQueryParam.getDepartName() != null && businessQueryParam.getDepartName().equals("运行测试2")) {
-            System.out.println("开始执行测试2");
-            modelClueService.generate(2);
-            System.out.println("测试2执行完毕");
-            return null;
-        }
-        if (businessQueryParam.getDepartName() != null && businessQueryParam.getDepartName().equals("运行测试3")) {
-            System.out.println("开始执行测试3");
-            modelClueService.generate(3);
-            System.out.println("测试3执行完毕");
-            return null;
-        }
-        if (businessQueryParam.getDepartName() != null && businessQueryParam.getDepartName().equals("运行测试4")) {
-            System.out.println("开始执行测试4");
-            modelClueService.generate(4);
-            System.out.println("测试4执行完毕");
-            return null;
+        // 测模型
+        String departName = businessQueryParam.getDepartName();
+        if (departName != null && departName.startsWith("运行测试")) {
+            int testNumber = Integer.parseInt(departName.substring(4));
+            System.out.println("开始执行测试" + testNumber);
+            modelClueService.generate(testNumber);
+            System.out.println("测试" + testNumber + "执行完毕");
         }
+        // 测导入单位关联表
         if (businessQueryParam.getDepartName() != null && businessQueryParam.getDepartName().equals("导入单位")) {
+            System.out.println("开始导入单位");
             externalDepartService.insertPreData();
-            System.out.println("执行完毕");
+            System.out.println("导入单位完毕");
             return null;
         }
         QueryWrapper<BusinessPoliceModel> queryWrapper = new QueryWrapper<>();
@@ -119,18 +106,7 @@ public class BusinessDepartService extends ServiceImpl<BusinessDepartMapper, Bus
             return;
         }
         List<String> departIds = new ArrayList<>();
-        if (!gBaseJJDSList.isEmpty()) {
-            departIds.addAll(gBaseJJDSList.stream().map(GBaseJJD::getGxdwdm).toList());
-        }
-        if (!gBaseAJJBXXListSA.isEmpty()) {
-            departIds.addAll(gBaseAJJBXXListSA.stream().map(GBaseAJJBXX::getBADWIDdm).toList());
-        }
-        if (!gBaseAJJBXXListLA.isEmpty()) {
-            departIds.addAll(gBaseAJJBXXListLA.stream().map(GBaseAJJBXX::getLADWBMdm).toList());
-        }
-        if (!gBaseAJJBXXListPA.isEmpty()) {
-            departIds.addAll(gBaseAJJBXXListPA.stream().map(GBaseAJJBXX::getLADWBMdm).toList());
-        }
+        generateDepartIds(gBaseJJDSList, departIds, gBaseAJJBXXListSA, gBaseAJJBXXListLA, gBaseAJJBXXListPA);
         if (departIds.isEmpty()) {
             return;
         }
@@ -156,6 +132,21 @@ public class BusinessDepartService extends ServiceImpl<BusinessDepartMapper, Bus
         Map<String, Long> resultMap = resultList.stream().collect(Collectors.toMap(map -> (String) map.get("departId"), map -> (Long) map.get("groupId")));
         Map<String, Long> resultMap4 = resultList2.stream().collect(Collectors.toMap(map -> (String) map.get("departId"), map -> (Long) map.get("groupId")));
         List<Long> groupIds = new ArrayList<>();
+        generateBusinessDepartList(happenTime, gBaseJJDSList, resultMap, resultMap2, resultMap4, 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")));
+        for (BusinessDepart businessDepart : businessDepartList) {
+            businessDepart.setGroupName(names.get(businessDepart.getGroupId()));
+            businessDepart.setCreateTime(LocalDateTime.now());
+        }
+        log.info("单位业务数据准备插入：{}", businessDepartList.size());
+        List<BatchResult> insert = baseMapper.insert(businessDepartList);
+        log.info("单位业务数据插入成功");
+        int actualNum = (int) Arrays.stream(insert.get(0).getUpdateCounts()).parallel().filter(num -> num != 0).count();
+        businessLogMapper.insert(new BusinessLog().setType("单位业务数据").setNum(gBaseJJDSList.size() + gBaseAJJBXXListSA.size() + gBaseAJJBXXListLA.size() + gBaseAJJBXXListPA.size()).setActualNum(actualNum).setCreateTime(LocalDateTime.now()));
+    }
+
+    private static void generateBusinessDepartList(List<Date> happenTime, List<GBaseJJD> gBaseJJDSList, Map<String, Long> resultMap, Map<String, String> resultMap2, Map<String, Long> resultMap4, List<Long> groupIds, List<BusinessDepart> businessDepartList, List<GBaseAJJBXX> gBaseAJJBXXListSA, List<GBaseAJJBXX> gBaseAJJBXXListLA, List<GBaseAJJBXX> gBaseAJJBXXListPA) {
         for (GBaseJJD gBaseJJD : gBaseJJDSList) {
             Long groupId = resultMap.get(resultMap2.get(gBaseJJD.getGxdwdm()));
             if (groupId == null) {
@@ -192,17 +183,21 @@ public class BusinessDepartService extends ServiceImpl<BusinessDepartMapper, Bus
             BusinessDepart businessDepart = getAJJBXXBusinessDepart(happenTime, gBaseAJJBXX, groupId, 3);
             businessDepartList.add(businessDepart);
         }
-        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")));
-        for (BusinessDepart businessDepart : businessDepartList) {
-            businessDepart.setGroupName(names.get(businessDepart.getGroupId()));
-            businessDepart.setCreateTime(LocalDateTime.now());
+    }
+
+    private static void generateDepartIds(List<GBaseJJD> gBaseJJDSList, List<String> departIds, List<GBaseAJJBXX> gBaseAJJBXXListSA, List<GBaseAJJBXX> gBaseAJJBXXListLA, List<GBaseAJJBXX> gBaseAJJBXXListPA) {
+        if (!gBaseJJDSList.isEmpty()) {
+            departIds.addAll(gBaseJJDSList.stream().map(GBaseJJD::getGxdwdm).toList());
+        }
+        if (!gBaseAJJBXXListSA.isEmpty()) {
+            departIds.addAll(gBaseAJJBXXListSA.stream().map(GBaseAJJBXX::getBADWIDdm).toList());
+        }
+        if (!gBaseAJJBXXListLA.isEmpty()) {
+            departIds.addAll(gBaseAJJBXXListLA.stream().map(GBaseAJJBXX::getLADWBMdm).toList());
+        }
+        if (!gBaseAJJBXXListPA.isEmpty()) {
+            departIds.addAll(gBaseAJJBXXListPA.stream().map(GBaseAJJBXX::getLADWBMdm).toList());
         }
-        log.info("单位业务数据准备插入：{}", businessDepartList.size());
-        List<BatchResult> insert = baseMapper.insert(businessDepartList);
-        log.info("单位业务数据插入成功");
-        int actualNum = (int) Arrays.stream(insert.get(0).getUpdateCounts()).parallel().filter(num -> num != 0).count();
-        businessLogMapper.insert(new BusinessLog().setType("单位业务数据").setNum(gBaseJJDSList.size() + gBaseAJJBXXListSA.size() + gBaseAJJBXXListLA.size() + gBaseAJJBXXListPA.size()).setActualNum(actualNum).setCreateTime(LocalDateTime.now()));
     }
 
     private static BusinessDepart getJJDBusinessDepart(List<Date> happenTime, GBaseJJD gBaseJJD, Long groupId) {
diff --git a/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java b/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java
index 29299fb..4427159 100644
--- a/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java
+++ b/src/main/java/com/biutag/supervision/service/BusinessPoliceService.java
@@ -99,9 +99,9 @@ public class BusinessPoliceService extends ServiceImpl<BusinessPoliceMapper, Bus
         Map<String, GBaseAJJBXX> gBaseAJJBXXMapSR = new HashMap<>();
         Map<String, GBaseAJJBXX> gBaseAJJBXXMapLR = new HashMap<>();
         Map<String, GBaseAJJBXX> gBaseAJJBXXMapPR = new HashMap<>();
-        setAJJBXXMap(zfbaresult, gBaseAJJBXXMapSR, gBaseAJJBXXMapLR, gBaseAJJBXXMapPR);
+        generateAJJBXXMap(zfbaresult, gBaseAJJBXXMapSR, gBaseAJJBXXMapLR, gBaseAJJBXXMapPR);
         List<String> departIds = new ArrayList<>();
-        setDepartIds(gBaseCJDSList, departIds, zfbaresult);
+        generateDepartIds(gBaseCJDSList, departIds, zfbaresult);
         if (departIds.isEmpty()) {
             return;
         }
@@ -120,7 +120,7 @@ public class BusinessPoliceService extends ServiceImpl<BusinessPoliceMapper, Bus
         Map<String, Long> resultMap4 = resultList2.stream().collect(Collectors.toMap(map -> (String) map.get("departId"), map -> (Long) map.get("groupId")));
 
         List<Long> groupIds = new ArrayList<>();
-        setBusinessPoliceList(happenTime, gBaseCJDSList, resultMap, resultMap2, resultMap4, groupIds, businessPoliceList, gBaseAJJBXXMapSR, gBaseAJJBXXMapLR, gBaseAJJBXXMapPR);
+        generateBusinessPoliceList(happenTime, gBaseCJDSList, resultMap, resultMap2, resultMap4, groupIds, businessPoliceList, gBaseAJJBXXMapSR, gBaseAJJBXXMapLR, gBaseAJJBXXMapPR);
         List<Map<Long, Object>> nameList = statisticsGroupMapper.getNameByGroupIds(groupIds);
         Map<Long, String> names = nameList.stream().collect(Collectors.toMap(
                 map -> (Long) map.get("groupId"),
@@ -137,7 +137,7 @@ public class BusinessPoliceService extends ServiceImpl<BusinessPoliceMapper, Bus
         businessLogMapper.insert(new BusinessLog().setType("个人业务数据").setNum(gBaseCJDSList.size()).setActualNum(actualNum).setCreateTime(LocalDateTime.now()));
     }
 
-    private static void setBusinessPoliceList(List<Date> happenTime, List<GBaseCJD> gBaseCJDSList, Map<String, Long> resultMap, Map<String, String> resultMap2, Map<String, Long> resultMap4, List<Long> groupIds, List<BusinessPolice> businessPoliceList, Map<String, GBaseAJJBXX> gBaseAJJBXXMapSR, Map<String, GBaseAJJBXX> gBaseAJJBXXMapLR, Map<String, GBaseAJJBXX> gBaseAJJBXXMapPR) {
+    private static void generateBusinessPoliceList(List<Date> happenTime, List<GBaseCJD> gBaseCJDSList, Map<String, Long> resultMap, Map<String, String> resultMap2, Map<String, Long> resultMap4, List<Long> groupIds, List<BusinessPolice> businessPoliceList, Map<String, GBaseAJJBXX> gBaseAJJBXXMapSR, Map<String, GBaseAJJBXX> gBaseAJJBXXMapLR, Map<String, GBaseAJJBXX> gBaseAJJBXXMapPR) {
         for (GBaseCJD gBaseCJD : gBaseCJDSList) {
             Long groupId = resultMap.get(resultMap2.get(gBaseCJD.getCjdxssdwdm()));
             if (groupId == null) {
@@ -176,7 +176,7 @@ public class BusinessPoliceService extends ServiceImpl<BusinessPoliceMapper, Bus
         }
     }
 
-    private static void setDepartIds(List<GBaseCJD> gBaseCJDSList, List<String> departIds, ZFBAResult zfbaresult) {
+    private static void generateDepartIds(List<GBaseCJD> gBaseCJDSList, List<String> departIds, ZFBAResult zfbaresult) {
         List<String> collect = gBaseCJDSList.stream().map(GBaseCJD::getCjdxssdwdm).toList();
         if (!collect.isEmpty()) {
             departIds.addAll(collect);
@@ -199,7 +199,7 @@ public class BusinessPoliceService extends ServiceImpl<BusinessPoliceMapper, Bus
         }
     }
 
-    private static void setAJJBXXMap(ZFBAResult zfbaresult, Map<String, GBaseAJJBXX> gBaseAJJBXXMapSR, Map<String, GBaseAJJBXX> gBaseAJJBXXMapLR, Map<String, GBaseAJJBXX> gBaseAJJBXXMapPR) {
+    private static void generateAJJBXXMap(ZFBAResult zfbaresult, Map<String, GBaseAJJBXX> gBaseAJJBXXMapSR, Map<String, GBaseAJJBXX> gBaseAJJBXXMapLR, Map<String, GBaseAJJBXX> gBaseAJJBXXMapPR) {
         for (Map<String, Object> bar : zfbaresult.bar1()) {
             if (bar.get("BAR1ID") == null) {
                 continue;
@@ -236,7 +236,6 @@ public class BusinessPoliceService extends ServiceImpl<BusinessPoliceMapper, Bus
                 gBaseAJJBXXMapSR.put(gBaseAJJBXX.getBARID(), gBaseAJJBXX);
             }
         }
-
         for (Map<String, Object> bar : zfbaresult.bar3()) {
             if (bar.get("BAR1ID") == null) {
                 continue;