Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java
#	src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java

src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java

@@ -142,8 +142,8 @@ public class ApplicationEvent {
             pointService.syncFatherEducation(initDomain(List.of(112)));
             pointService.syncMotherEducation(initDomain(List.of(113)));
             pointService.syncDomicileType(initDomain(List.of(114)));
-            pointService.syncCriminalPunishment(initDomain(List.of(115)));// 需重跑 报错
-            pointService.syncAdministrativePunishment(initDomain(List.of(116)));// 需重跑
+            pointService.syncCriminalPunishment(initDomain(List.of(115)));
+            pointService.syncAdministrativePunishment(initDomain(List.of(116)));
             pointService.syncParentsDivorce(initDomain(List.of(117)));
             pointService.syncFamilyDie(initDomain(List.of(118)));
             pointService.syncFatherDie(initDomain(List.of(119)));

src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java

@@ -25,6 +25,10 @@ public interface GBaseCSCZRKMapper extends BaseMapper<GBaseCSCZRK> {
             + "</script>")
     List<GBaseCSCZRK> selectDomicileType(List<String> idNos);
 
+    // 户籍类型
+    @Select("SELECT a.gmsfhm, a.hlxmc FROM dwd_ry_kxgxzyk_csczrk a inner join csga_wdpcdb.wdpc_person b on a.gmsfhm = b.id_code WHERE a.hlxmc is not null")
+    List<GBaseCSCZRK> selectDomicileType();
+
     // 父母婚姻变故
     @Select("<script>"
             + "select distinct gmsfhm from (SELECT DISTINCT a.gmsfhm FROM csga_dwd.dwd_ry_kxgxzyk_csczrk a join csga_wdpcdb.wdpc_grjd_lhxx b "
@@ -36,6 +40,11 @@ public interface GBaseCSCZRKMapper extends BaseMapper<GBaseCSCZRK> {
             + "</script>")
     List<GBaseCSCZRK> selectParentsDivorce(List<String> idNos);
 
+    // 父母婚姻变故
+    @Select("select distinct a.gmsfhm from (SELECT DISTINCT a.gmsfhm FROM csga_dwd.dwd_ry_kxgxzyk_csczrk a join csga_wdpcdb.wdpc_grjd_lhxx b "
+            + "on (a.fqgmsfzhm = b.male_id_code or a.mqgmsfzhm = b.female_id_code)) a inner join csga_wdpcdb.wdpc_person b on a.gmsfhm = b.id_code;")
+    List<GBaseCSCZRK> selectParentsDivorce();
+
     // 亲近家人死亡
     @Select("<script>"
             + "select distinct gmsfhm from dwd_ry_kxgxzyk_csczrk where gmsfhm not in "
@@ -96,6 +105,20 @@ public interface GBaseCSCZRKMapper extends BaseMapper<GBaseCSCZRK> {
             + "</script>")
     List<GBaseCSCZRK> selectChildNo(List<String> idNos);
 
+    // 行为人子女数
+    @Select("SELECT c.gmsfhm, SUM(CASE WHEN c.mc1 = '子' AND c.mc2 IN ('孙子','孙女') THEN 1 "
+            + "WHEN c.mc1 = '女' AND c.mc2 IN ('外孙子','外孙女') THEN 1 "
+            + "WHEN c.mc1 IN ('户主','本人','妻','夫','配偶') AND c.mc2 IN ('子','女','独生子','独生女','长子','次子','三子','四子','五子','二女','三女','四女','五女') THEN 1 "
+            + "WHEN c.mc1 IN ('父亲','母亲') AND c.mc2 IN ('户主','本人','兄','弟','姐姐','妹妹') THEN 1 "
+            + "WHEN c.mc1 IN ('兄','弟') AND c.mc2 IN ('侄女','侄子') THEN 1 "
+            + "WHEN c.mc1 IN ('姐姐','妹妹') AND c.mc2 IN ('外甥女','外甥') THEN 1 "
+            + "WHEN c.mc1 IN ('独生女','长女','二女','儿媳') AND c.mc2 IN ('外孙子','外孙女') THEN 1 "
+            + "WHEN c.mc1 IN ('独生子','长子','次子','女婿') AND c.mc2 IN ('孙子','孙女') THEN 1 "
+            + "ELSE 0 END) AS score from "
+            + "(SELECT a.gmsfhm, a.yhzgxmc mc1, b.yhzgxmc mc2 FROM dwd_ry_kxgxzyk_csczrk a JOIN dwd_ry_kxgxzyk_csczrk b ON a.hh = b.hh "
+            + "inner join csga_wdpcdb.wdpc_person d on a.gmsfhm = d.id_code WHERE a.gmsfhm != b.gmsfhm) c GROUP BY c.gmsfhm")
+    List<GBaseCSCZRK> selectChildNo();
+
     // 家人患严重疾病
     @Select("<script>"
             + "select distinct gmsfhm from dwd_ry_kxgxzyk_csczrk where gmsfhm not in "

src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseGAXZCFJDSMapper.java

@@ -12,7 +12,6 @@ import java.util.List;
  * @since 1.8
  */
 public interface GBaseGAXZCFJDSMapper extends BaseMapper<GBaseGAXZCFJDS> {
-    @Select("select ajbh, ajmc, zjhm, cfms1, "
-            + "(SELECT COUNT(DISTINCT ajbh) FROM dwd_wp_zfba_gaxzcfjds AS sub WHERE sub.zjhm = main.zjhm) count_num from dwd_wp_zfba_gaxzcfjds main;")
+    @Select("select a.ajbh, a.ajmc, a.zjhm, a.cfms1 from dwd_wp_zfba_gaxzcfjds a inner join csga_wdpcdb.wdpc_person b on a.zjhm = b.id_code;")
     List<GBaseGAXZCFJDS> selectAdministrativePunishment();
 }

src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseJJDMapper.java

@@ -85,6 +85,13 @@ public interface GBaseJJDMapper extends BaseMapper<GBaseJJD> {
             + "AND bjrzjhm is not null and bjsj > '2019-12-06 00:00:00' and substr(jqxzdm, 1, 2) != '99';")
     List<GBaseJJD> selectFiliation(List<String> idNos);
 
+    // 与子女关系
+    @Select(" select a.jjdbh, a.bjrzjhm, a.bjnr,a.cjqk ,a.bjsj from dwd_asj_zhtx_jjd a inner join csga_wdpcdb.wdpc_person b on a.bjrzjhm = b.id_code "
+            + "where (a.jqxzmc like '%纠纷%' or a.jqxzmc like '%矛盾%') "
+            + "AND (a.bjnr like '%孩子%' OR a.bjnr like '%儿子%' OR a.bjnr like '%女儿%' OR a.bjnr like '%子女%' OR a.cjqk like '%孩子%' OR a.cjqk like '%儿子%' OR a.cjqk like '%女儿%' OR a.cjqk like '%子女%') "
+            + "AND a.bjrzjhm is not null and a.bjsj > '2019-12-06 00:00:00' and substr(a.jqxzdm, 1, 2) != '99';")
+    List<GBaseJJD> selectFiliation();
+
     @Select(" select jjdbh, bjdh,bjrxm ,bjrzjhm, bjnr, cjqk, bjsj from dwd_asj_zhtx_jjd " +
             " where jqxzmc like '%纠纷%' and SUBSTR(jqxzdm, 1, 2) != '99' and bjsj >= #{start}  and " +
             " (bjnr like '%与父亲%' or cjqk like '%与父亲%' or " +

src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRWFXXMapper.java

@@ -19,5 +19,12 @@ public interface GBaseWFRWFXXMapper extends BaseMapper<GBaseWFRWFXX> {
             "from dwd_asj_zfba_ajjbxx a " +
             "join dwd_asj_zfba_wfrwfxx b on a.ajbh = b.ajbh " +
             "where a.ajbzdm = 1;")
+    List<GBaseWFRWFXX> selectCriminalPunishmentOld();
+
+    @Select("select b.ajbh, b.zjhm, b.ajmc, b.jysm, b.djrq, " +
+            "from dwd_asj_zfba_ajjbxx a " +
+            "join dwd_asj_zfba_wfrwfxx b on a.ajbh = b.ajbh " +
+            "inner join csga_wdpcdb.wdpc_person c on b.zjhm = c.id_code " +
+            "where a.ajbzdm = 1;")
     List<GBaseWFRWFXX> selectCriminalPunishment();
 }

src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcGrjdJsbryMapper.java

@@ -20,4 +20,7 @@ public interface WdpcGrjdJsbryMapper extends BaseMapper<WdpcGrjdJsbry> {
             + "</foreach>"
             + "</script>")
     List<WdpcGrjdJsbry> selectByIdNos(List<String> idNos);
+
+    @Select("select a.id_code, a.actual_time, a.actual_id from wdpc_grjd_jsbry a inner join negative.risk_personal b on a.id_code = b.id_code;")
+    List<WdpcGrjdJsbry> selectByIdNos();
 }

src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcJZJLBMapper.java

@@ -12,11 +12,17 @@ import java.util.List;
  * @since 1.8
  */
 public interface WdpcJZJLBMapper extends BaseMapper<WdpcJZJLB> {
+    @Select("select a.id_code, a.disease_name from wdpc_grjd_jzjlb a inner join negative.risk_personal b on a.id_code = b.id_code "
+            + "where (a.disease_name like '%恶性肿瘤%' or a.disease_name like '%移植%' or a.disease_name like '%帕金森%' "
+            + "or a.disease_name like '%精神病%' or a.disease_name like '%严重%' or a.disease_name like '%脑中风%' "
+            + "or a.disease_name like '%急性心肌梗塞%' or (a.disease_name like '%脑损伤%' and '%重%'))")
+    List<WdpcJZJLB> selectSeriousIllness();
+
     @Select("select id_code, disease_name from wdpc_grjd_jzjlb "
             + "where (disease_name like '%恶性肿瘤%' or disease_name like '%移植%' or disease_name like '%帕金森%' "
             + "or disease_name like '%精神病%' or disease_name like '%严重%' or disease_name like '%脑中风%' "
             + "or disease_name like '%急性心肌梗塞%' or (disease_name like '%脑损伤%' and '%重%'))")
-    List<WdpcJZJLB> selectSeriousIllness();
+    List<WdpcJZJLB> selectFamilySeriousIllness();
 
     @Select("select id_code from wdpc_grjd_jzjlb "
             + "where disease_name like '%艾滋%'")

src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcSqjzryMapper.java

@@ -19,4 +19,7 @@ public interface WdpcSqjzryMapper extends BaseMapper<WdpcSqjzry> {
             + "</foreach>"
             + "</script>")
     List<WdpcSqjzry> selectByIdNos(List<String> idNos);
+
+    @Select("select a.id_code, a.sentence_organization_name, a.correct_end_time, a.correct_begin_time, a.action_place, a.crime_describe from wdpc_grjd_sqjzry a inner join negative.risk_personal b on a.id_code = b.id_code;")
+    List<WdpcSqjzry> selectByIdNos();
 }

src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXdryMapper.java

@@ -20,4 +20,8 @@ public interface WdpcXdryMapper extends BaseMapper<WdpcXdry> {
             + "</foreach>"
             + "</script>")
     List<WdpcXdry> selectXIDU(List<String> idCard);
+
+    @Select("select a.sfzh, a.xm, a.fxdw_dwmc, a.fxjsrq, a.fxqsrq, a.chdw_dwmc, a.gkxz_mc, a.jlsmc, a.rsrq, a.csrq from wdpc_grjd_xdry a "
+            + "inner join negative.risk_personal b on a.sfzh = b.id_code where (a.swrq is not null or a.swyy is not null);")
+    List<WdpcXdry> selectXIDU();
 }

src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXfsjCsDetailMapper.java

@@ -24,6 +24,11 @@ public interface WdpcXfsjCsDetailMapper extends BaseMapper<WdpcXfsjCsDetail> {
             + "</script>")
     List<WdpcXfsjCsDetail> selectPetitionContent5(List<String> idNos);
 
+    @Select("select a.id_code, count(a.id_code) count_num, a.detail from wdpc_grjd_xfsj_cs_detail a inner join negative.risk_personal b on a.id_code = b.id_code "
+            + "where (a.detail like '%退%' or a.detail like '%迁%' or a.detail like '%军%') "
+            + "and (a.detail not like '%投诉%' and a.detail not like '%举报%' and a.detail not like '%不公%' and a.detail not like '%交房%');")
+    List<WdpcXfsjCsDetail> selectPetitionContent5();
+
     @Select("<script>"
             + "select id_code, count(id_code) count_num, detail from wdpc_grjd_xfsj_cs_detail "
             + "where (detail like '%投诉%' or detail like '%举报%') "
@@ -36,6 +41,11 @@ public interface WdpcXfsjCsDetailMapper extends BaseMapper<WdpcXfsjCsDetail> {
             + "</script>")
     List<WdpcXfsjCsDetail> selectPetitionContent3(List<String> idNos);
 
+    @Select("select a.id_code, count(a.id_code) count_num, a.detail from wdpc_grjd_xfsj_cs_detail a inner join negative.risk_personal b on a.id_code = b.id_code "
+            + "where (a.detail like '%投诉%' or a.detail like '%举报%') "
+            + "and (a.detail not like '%退%' and a.detail not like '%迁%' and a.detail not like '%军%' and a.detail not like '%不公%' and a.detail not like '%交房%');")
+    List<WdpcXfsjCsDetail> selectPetitionContent3();
+
     @Select("<script>"
             + "select id_code, count(id_code) count_num, detail from wdpc_grjd_xfsj_cs_detail "
             + "where (detail like '%不公%' or detail like '%交房%') "
@@ -48,6 +58,11 @@ public interface WdpcXfsjCsDetailMapper extends BaseMapper<WdpcXfsjCsDetail> {
             + "</script>")
     List<WdpcXfsjCsDetail> selectPetitionContent2(List<String> idNos);
 
+    @Select("select a.id_code, count(a.id_code) count_num, a.detail from wdpc_grjd_xfsj_cs_detail a inner join negative.risk_personal b on a.id_code = b.id_code "
+            + "where (a.detail like '%不公%' or a.detail like '%交房%') "
+            + "and (a.detail not like '%退%' and a.detail not like '%迁%' and a.detail not like '%军%' and a.detail not like '%投诉%' and a.detail not like '%举报%');")
+    List<WdpcXfsjCsDetail> selectPetitionContent2();
+
     @Select("<script>"
             + "select distinct id_code from wdpc_grjd_xfsj_cs_detail "
             + "where satisfaction_code = '1' "
@@ -58,4 +73,9 @@ public interface WdpcXfsjCsDetailMapper extends BaseMapper<WdpcXfsjCsDetail> {
             + " group by id_code"
             + "</script>")
     List<WdpcXfsjCsDetail> selectPetitionDissatisfied(List<String> idNos);
+
+    @Select("select distinct a.id_code from wdpc_grjd_xfsj_cs_detail a inner join negative.risk_personal b on a.id_code = b.id_code "
+            + "where a.satisfaction_code = '1' "
+            + "group by a.id_code")
+    List<WdpcXfsjCsDetail> selectPetitionDissatisfied();
 }

src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXmsfryMapper.java

@@ -19,4 +19,7 @@ public interface WdpcXmsfryMapper extends BaseMapper<WdpcXmsfry> {
             + "</foreach>"
             + "</script>")
     List<WdpcXmsfry> selectByIdNos(List<String> idNos);
+
+    @Select("select a.id_code, a.crime_name, a.sentence_time, a.prison_begin, a.prison_end, a.prison_organization from wdpc_grjd_xmsfry a inner join negative.risk_personal b on a.id_code = b.id_code;")
+    List<WdpcXmsfry> selectByIdNos();
 }

src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcYbxxMapper.java

@@ -12,6 +12,6 @@ import java.util.List;
  * @since 1.8
  */
 public interface WdpcYbxxMapper extends BaseMapper<WdpcYbxx> {
-    @Select("select distinct id_code from wdpc_grjd_ybxx")
+    @Select("select distinct a.id_code from wdpc_grjd_ybxx a inner join negative.risk_personal b on a.id_code = b.id_code;")
     List<String> selectMedicalPressure();
 }

src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java

@@ -308,25 +308,21 @@ public class PointServiceImpl implements PointService {
         log.info("模型116开始查询");
         List<GBaseGAXZCFJDS> list = gAXZCFJDSRepository.getBaseMapper().selectAdministrativePunishment();
         log.info("模型116查询结果数：{}", list.size());
+        Map<String, List<GBaseGAXZCFJDS>> gAXZCFJDSMap = list.stream().collect(Collectors.groupingBy(GBaseGAXZCFJDS::getZjhm));
         Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal));
         List<RiskModelTaskClue> toInsert = new ArrayList<>();
-        for (GBaseGAXZCFJDS domicileType : list) {
-            RiskPersonal personal = personalMap.get(domicileType.getZjhm());
+        for (Map.Entry<String, List<GBaseGAXZCFJDS>> entry : gAXZCFJDSMap.entrySet()) {
+            String zjhm = entry.getKey();
+            List<GBaseGAXZCFJDS> wfrwfxxList = entry.getValue();
+            RiskPersonal personal = personalMap.get(zjhm);
             if (personal == null) continue;
-            if (idCode.get(domicileType.getZjhm()) != null) continue;
-            if (oldMap.get(domicileType.getZjhm()) != null) continue;
+            if (idCode.get(zjhm) != null) continue;
+            if (oldMap.get(zjhm) != null) continue;
 
-            idCode.put(domicileType.getZjhm(), 1);
+            idCode.put(zjhm, 1);
             int score;
-            if (domicileType.getCountNum() > 5) {
-                score = 5;
-            } else {
-                score = domicileType.getCountNum();
-            }
-            String context = "";
-            if (domicileType.getCountNum() > 1) {
-                context = "其中一件";
-            }
+            String context = wfrwfxxList.stream().map(GBaseGAXZCFJDS::getAjbh).collect(Collectors.joining(","));
+            score = Math.min(wfrwfxxList.size(), 5);
             ClueData data = ClueData.builder()
                     .name(personal.getName())
                     .id(personal.getId().toString())
@@ -334,11 +330,9 @@ public class PointServiceImpl implements PointService {
                     .tag("受到行政处罚")
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
-                    .sourceData("发现该人员涉及" + domicileType.getCountNum() + "起案件，" + context + "为“" + domicileType.getAjmc() + "”，案件编号："
-                            + domicileType.getAjbh() + "，处罚内容为“" + domicileType.getCfms1()
-                            + "”。因受到" + domicileType.getCountNum() + "起行政处罚")
+                    .sourceData("发现该人员涉及" + wfrwfxxList.size() + "个行政处罚，案件编号为：“" + context + "”" )
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(createClue(task.getModelId(), score, task.getId(), data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.ADMINISTRATIVEPUNISHMENT);
@@ -362,27 +356,21 @@ public class PointServiceImpl implements PointService {
         log.info("模型115开始查询");
         List<GBaseWFRWFXX> list = wFRWFXXRepository.getBaseMapper().selectCriminalPunishment();
         log.info("模型115查询结果数：{}", list.size());
+        Map<String, List<GBaseWFRWFXX>> wfrwfxxMap = list.stream().collect(Collectors.groupingBy(GBaseWFRWFXX::getZjhm));
         Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal));
         List<RiskModelTaskClue> toInsert = new ArrayList<>();
-        for (GBaseWFRWFXX domicileType : list) {
-            RiskPersonal personal = personalMap.get(domicileType.getZjhm());
+        for (Map.Entry<String, List<GBaseWFRWFXX>> entry : wfrwfxxMap.entrySet()) {
+            String zjhm = entry.getKey();
+            List<GBaseWFRWFXX> wfrwfxxList = entry.getValue();
+            RiskPersonal personal = personalMap.get(zjhm);
             if (personal == null) continue;
-            if (idCode.get(domicileType.getZjhm()) != null) continue;
-            if (oldMap.get(domicileType.getZjhm()) != null) continue;
+            if (idCode.get(zjhm) != null) continue;
+            if (oldMap.get(zjhm) != null) continue;
 
-            idCode.put(domicileType.getZjhm(), 1);
+            idCode.put(zjhm, 1);
             int score;
-            String context = "";
-            if (domicileType.getCountNum() > 5) {
-                score = 5;
-            } else {
-                score = domicileType.getCountNum();
-            }
-            if (domicileType.getCountNum() > 1) {
-                context = "。除此案件外，该人员还有" + domicileType.getCountNum() + "个刑事处罚";
-            } else {
-                context = "。因受到过1个刑事处罚";
-            }
+            String context = wfrwfxxList.stream().map(GBaseWFRWFXX::getAjbh).collect(Collectors.joining(","));
+            score = Math.min(wfrwfxxList.size(), 5);
             ClueData data = ClueData.builder()
                     .name(personal.getName())
                     .id(personal.getId().toString())
@@ -390,10 +378,9 @@ public class PointServiceImpl implements PointService {
                     .tag("受到刑事处罚")
                     .eventTime(LocalDateTime.now())
                     .personId(personal.getId())
-                    .sourceData("发现该人员" + domicileType.getJysm() + "案件编号：" + domicileType.getAjbh()
-                            + context )
+                    .sourceData("发现该人员涉及" + wfrwfxxList.size() + "个刑事案件，案件编号为：“" + context + "”" )
                     .build();
-            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+            toInsert.add(createClue(task.getModelId(), score, task.getId(), data));
         }
         if (!toInsert.isEmpty()) {
             modelTaskClueService.saveClues(toInsert, Default.CRIMINALPUNISHMENT);
@@ -414,12 +401,8 @@ public class PointServiceImpl implements PointService {
 
         Map<String, RiskModelTaskClue> oldMap = domain.getOldMap(task.getModelId(), true);
         Map<String, Integer> idCode = new HashMap<>();
-        List<GBaseCSCZRK> list = new ArrayList<>();
         log.info("模型117开始查询");
-        for (List<String> idCard : domain.getIdCards()) {
-            list.addAll(cSCZRKRepository.getBaseMapper().selectParentsDivorce(idCard));
-            log.info("模型117查询进度 | {}", list.size());
-        }
+        List<GBaseCSCZRK> list = cSCZRKRepository.getBaseMapper().selectParentsDivorce();
         log.info("模型117查询结果数：{}", list.size());
         Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal));
         List<RiskModelTaskClue> toInsert = new ArrayList<>();
@@ -565,7 +548,7 @@ public class PointServiceImpl implements PointService {
         Map<String, RiskModelTaskClue> oldMap = domain.getOldMap(task.getModelId(), true);
         Map<String, Integer> idCode = new HashMap<>();
         log.info("模型127开始查询");
-        List<WdpcJZJLB> wdpcJZJLBList = jZJLBRepository.getBaseMapper().selectSeriousIllness();
+        List<WdpcJZJLB> wdpcJZJLBList = jZJLBRepository.getBaseMapper().selectFamilySeriousIllness();
         // 切割 每次查10000条
         List<List<WdpcJZJLB>> wdpcJZJLBParts = IntStream.range(0, (wdpcJZJLBList.size() + 9999) / 10000)
                 .mapToObj(i -> wdpcJZJLBList.subList(i * 10000, Math.min((i + 1) * 10000, wdpcJZJLBList.size())))
@@ -660,17 +643,11 @@ public class PointServiceImpl implements PointService {
         Map<String, RiskModelTaskClue> oldMap = domain.getOldMap(task.getModelId(), true);
         Map<String, Integer> idCode = new HashMap<>();
         log.info("模型129开始查询");
-        List<WdpcGrjdJsbry> list1 = new ArrayList<>();
+        List<WdpcGrjdJsbry> list1 = jsbryRepository.getBaseMapper().selectByIdNos();
         List<WdpcJZJLB> list2 = jZJLBRepository.getBaseMapper().selectForModel129();;
-        List<WdpcXdry> list3 = new ArrayList<>();
-        List<WdpcSqjzry> list4 = new ArrayList<>();
-        List<WdpcXmsfry> list5 = new ArrayList<>();
-        for (List<String> idCard : domain.getIdCards()) {
-            list1.addAll(jsbryRepository.getBaseMapper().selectByIdNos(idCard));
-            list3.addAll(xdryRepository.getBaseMapper().selectXIDU(idCard));
-            list4.addAll(sqjzryRepository.getBaseMapper().selectByIdNos(idCard));
-            list5.addAll(xmsfryRepository.getBaseMapper().selectByIdNos(idCard));
-        }
+        List<WdpcXdry> list3 = xdryRepository.getBaseMapper().selectXIDU();
+        List<WdpcSqjzry> list4 = sqjzryRepository.getBaseMapper().selectByIdNos();
+        List<WdpcXmsfry> list5 = xmsfryRepository.getBaseMapper().selectByIdNos();
         log.info("模型129查询结果数：{},{},{},{},{}", list1.size(), list2.size(), list3.size(), list4.size(), list5.size());
         Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal));
         List<RiskModelTaskClue> toInsert = new ArrayList<>();
@@ -789,17 +766,11 @@ public class PointServiceImpl implements PointService {
         Map<String, RiskModelTaskClue> oldMap = domain.getOldMap(task.getModelId(), true);
         Map<String, Integer> idCode = new HashMap<>();
         log.info("模型130开始查询");
-        List<WdpcGrjdJsbry> list1 = new ArrayList<>();
+        List<WdpcGrjdJsbry> list1 = jsbryRepository.getBaseMapper().selectByIdNos();
         List<WdpcJZJLB> list2 = jZJLBRepository.getBaseMapper().selectForModel129();;
-        List<WdpcXdry> list3 = new ArrayList<>();
-        List<WdpcSqjzry> list4 = new ArrayList<>();
-        List<WdpcXmsfry> list5 = new ArrayList<>();
-        for (List<String> idCard : domain.getIdCards()) {
-            list1.addAll(jsbryRepository.getBaseMapper().selectByIdNos(idCard));
-            list3.addAll(xdryRepository.getBaseMapper().selectXIDU(idCard));
-            list4.addAll(sqjzryRepository.getBaseMapper().selectByIdNos(idCard));
-            list5.addAll(xmsfryRepository.getBaseMapper().selectByIdNos(idCard));
-        }
+        List<WdpcXdry> list3 = xdryRepository.getBaseMapper().selectXIDU();
+        List<WdpcSqjzry> list4 = sqjzryRepository.getBaseMapper().selectByIdNos();
+        List<WdpcXmsfry> list5 = xmsfryRepository.getBaseMapper().selectByIdNos();
         log.info("模型130查询结果数：{},{},{},{},{}", list1.size(), list2.size(), list3.size(), list4.size(), list5.size());
         Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal));
         List<RiskModelTaskClue> toInsert = new ArrayList<>();
@@ -1051,11 +1022,8 @@ public class PointServiceImpl implements PointService {
 
         Map<String, RiskModelTaskClue> oldMap = domain.getOldMap(task.getModelId(), true);
         Map<String, Integer> idCode = new HashMap<>();
-        List<WdpcXdry> list = new ArrayList<>();
         log.info("模型122开始查询");
-        for (List<String> idCard : domain.getIdCards()) {
-            list.addAll(xdryRepository.getBaseMapper().selectXIDU(idCard));
-        }
+        List<WdpcXdry> list = xdryRepository.getBaseMapper().selectXIDU();
         log.info("模型122查询结果数：{}", list.size());
         Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal));
         List<RiskModelTaskClue> toInsert = new ArrayList<>();
@@ -1158,15 +1126,10 @@ public class PointServiceImpl implements PointService {
 
         Map<String, RiskModelTaskClue> oldMap = domain.getOldMap(task.getModelId(), true);
         Map<String, Integer> idCode = new HashMap<>();
-        List<WdpcXfsjCsDetail> list5 = new ArrayList<>();
-        List<WdpcXfsjCsDetail> list3 = new ArrayList<>();
-        List<WdpcXfsjCsDetail> list2 = new ArrayList<>();
         log.info("模型124开始查询");
-        for (List<String> idCard : domain.getIdCards()) {
-            list5.addAll(xfsjCsDetailRepository.getBaseMapper().selectPetitionContent5(idCard));
-            list3.addAll(xfsjCsDetailRepository.getBaseMapper().selectPetitionContent3(idCard));
-            list2.addAll(xfsjCsDetailRepository.getBaseMapper().selectPetitionContent2(idCard));
-        }
+        List<WdpcXfsjCsDetail> list5 = xfsjCsDetailRepository.getBaseMapper().selectPetitionContent5();
+        List<WdpcXfsjCsDetail> list3 = xfsjCsDetailRepository.getBaseMapper().selectPetitionContent3();
+        List<WdpcXfsjCsDetail> list2 = xfsjCsDetailRepository.getBaseMapper().selectPetitionContent2();
         log.info("模型124查询结果数：{}、{}、{}", list5.size(), list3.size(), list2.size());
         Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal));
         List<RiskModelTaskClue> toInsert = new ArrayList<>();
@@ -1249,11 +1212,8 @@ public class PointServiceImpl implements PointService {
 
         Map<String, RiskModelTaskClue> oldMap = domain.getOldMap(task.getModelId(), true);
         Map<String, Integer> idCode = new HashMap<>();
-        List<GBaseJJD> list = new ArrayList<>();
         log.info("模型123开始查询");
-        for (List<String> idCard : domain.getIdCards()) {
-            list.addAll(jjdRepository.getBaseMapper().selectFiliation(idCard));
-        }
+        List<GBaseJJD> list = jjdRepository.getBaseMapper().selectFiliation();
         log.info("模型123查询结果数：{}", list.size());
         Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal));
         List<RiskModelTaskClue> toInsert = new ArrayList<>();
@@ -1302,11 +1262,8 @@ public class PointServiceImpl implements PointService {
 
         Map<String, RiskModelTaskClue> oldMap = domain.getOldMap(task.getModelId(), true);
         Map<String, Integer> idCode = new HashMap<>();
-        List<GBaseCSCZRK> list = new ArrayList<>();
         log.info("模型121开始查询");
-        for (List<String> idCard : domain.getIdCards()) {
-            list.addAll(cSCZRKRepository.getBaseMapper().selectChildNo(idCard));
-        }
+        List<GBaseCSCZRK> list = cSCZRKRepository.getBaseMapper().selectChildNo();
         log.info("模型121查询结果数：{}", list.size());
         Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal));
         List<RiskModelTaskClue> toInsert = new ArrayList<>();
@@ -1410,11 +1367,8 @@ public class PointServiceImpl implements PointService {
 
         Map<String, RiskModelTaskClue> oldMap = domain.getOldMap(task.getModelId(), true);
         Map<String, Integer> idCode = new HashMap<>();
-        List<GBaseCSCZRK> list = new ArrayList<>();
         log.info("模型114开始查询");
-        for (List<String> idCard : domain.getIdCards()) {
-            list.addAll(cSCZRKRepository.getBaseMapper().selectDomicileType(idCard));
-        }
+        List<GBaseCSCZRK> list = cSCZRKRepository.getBaseMapper().selectDomicileType();
         log.info("模型114查询结果数：{}", list.size());
         Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal));
         List<RiskModelTaskClue> toInsert = new ArrayList<>();
@@ -1564,10 +1518,7 @@ public class PointServiceImpl implements PointService {
 
         Map<String, RiskModelTaskClue> oldMap = domain.getOldMap(task.getModelId(), true);
         Map<String, Integer> idCode = new HashMap<>();
-        List<WdpcXfsjCsDetail> list = new ArrayList<>();
-        for (List<String> idCard : domain.getIdCards()) {
-            list.addAll(xfsjCsDetailRepository.getBaseMapper().selectPetitionDissatisfied(idCard));
-        }
+        List<WdpcXfsjCsDetail> list = xfsjCsDetailRepository.getBaseMapper().selectPetitionDissatisfied();
         log.info("模型128查询总结果数：{}", list.size());
         Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal));
         List<RiskModelTaskClue> toInsert = new ArrayList<>();
@@ -1609,9 +1560,9 @@ public class PointServiceImpl implements PointService {
         Map<String, RiskModelTaskClue> oldMap = domain.getOldMap(task.getModelId(), true);
         Map<String, Integer> idCode = new HashMap<>();
         List<WdpcGrjdXfsj> list = wdpcGrjdXfsjRepository.getBaseMapper().selectXfMan();
-        log.info("模型111第一次查询结果数：{}", list.size());
+        log.info("模型111(40)第一次查询结果数：{}", list.size());
         list.addAll(wdpcGrjdXfsjCsRepository.getBaseMapper().selectXfMan());
-        log.info("模型111第二次查询后总结果数：{}", list.size());
+        log.info("模型111(40)第二次查询后总结果数：{}", list.size());
         Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal));
         List<RiskModelTaskClue> toInsert = new ArrayList<>();
         for (WdpcGrjdXfsj xfMan : list) {
@@ -2272,6 +2223,7 @@ public class PointServiceImpl implements PointService {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy年M月d日");
                 return sdf.format(date);
             } catch (Exception e) {
+                log.error("时间转换失败:{}", date, e);
             }
         }
         return " 无时间数据 ";

src/main/java/com/biutag/supervisiondata/util/TxtUtil.java

@@ -1,15 +1,13 @@
 package com.biutag.supervisiondata.util;
 
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONArray;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.BufferedWriter;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 /**
  * @author kami on 2024-07-15 15:47:40
@@ -29,15 +27,14 @@ public class TxtUtil {
     }
 
     public static void main(String[] args) {
-        String content = "";
-        try {
-            content = new String(Files.readAllBytes(Paths.get("D:\\work\\code\\gitlab\\health-web\\src\\assets\\a.json")));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        JSONArray array = JSON.parseArray(content);
-        for (int i = 0; i < array.size(); i++) {
-            log.info("{}", array.getJSONObject(i).getString("id"));
+        Date date = new Date();
+        if (date != null) {
+            try {
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy年M月d日");
+                System.out.println(sdf.format(date));
+            } catch (Exception e) {
+            }
         }
+        System.out.println(" 无时间数据 ");
     }
 }