Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/biutag/supervisiondata/pojo/constants/Default.java

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

@@ -133,12 +133,14 @@ public class ApplicationEvent {
 //            pointService.syncControlNoPower(initDomain(List.of(48)));
 //            pointService.syncPointCall(initDomain(List.of(50)));
 //            pointService.syncOilBuy(initDomain(List.of(52)));
-//            pointService.syncIsPetition(initDomain(List.of(111)));
+            pointService.syncIsPetition(initDomain(List.of(40)));
 //            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.syncParentsDivorce(initDomain(List.of(117)));
+//            pointService.syncFamilyDie(initDomain(List.of(118))); // 未完成
         });
     }
 

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

@@ -24,4 +24,17 @@ public interface GBaseCSCZRKMapper extends BaseMapper<GBaseCSCZRK> {
             + "</foreach>"
             + "</script>")
     List<GBaseCSCZRK> selectDomicileType(List<String> idNos);
+
+    // 父母婚姻变故
+    @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 " +
+            "on a.fqgmsfzhm = b.male_id_code union all " +
+            "(SELECT DISTINCT a.gmsfhm FROM csga_dwd.dwd_ry_kxgxzyk_csczrk a join csga_wdpcdb.wdpc_grjd_lhxx b " +
+            "on a.mqgmsfzhm = b.female_id_code)) a " +
+            "WHERE gmsfhm IN "
+            + "<foreach item='item' index='index' collection='list' open='(' separator=',' close=')'>"
+            + "#{item}"
+            + "</foreach>"
+            + "</script>")
+    List<GBaseCSCZRK> selectParentsDivorce(List<String> idNos);
 }

src/main/java/com/biutag/supervisiondata/pojo/constants/Default.java

@@ -92,7 +92,7 @@ public class Default {
 
     public static final String CAR_IG ="有车因素";
 
-    public static final String IS_PETITION = "是否上访";
+    public static final String IS_PETITION = "信访、投诉-信访局信访";
 
     public static final String FATHER_EDUCATION = "父亲文化程度";
 
@@ -104,5 +104,9 @@ public class Default {
 
     public static final String ADMINISTRATIVEPUNISHMENT = "受到行政处罚";
 
+    public static final String PARENTSDIVORCE = "父母离婚";
+
+    public static final String FAMILYDIE = "亲近家人死亡";
+
 
 }

src/main/java/com/biutag/supervisiondata/service/PointService.java

@@ -60,4 +60,10 @@ public interface PointService {
 
     // 行政处罚
     void syncAdministrativePunishment(TaskParamDomain domain);
+
+    // 父母婚姻变故
+    void syncParentsDivorce(TaskParamDomain domain);
+
+    // 亲近家人死亡
+    void syncFamilyDie(TaskParamDomain domain);
 }

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

@@ -321,6 +321,96 @@ public class PointServiceImpl implements PointService {
         taskRepository.updateById(updateTask);
     }
 
+    @Override
+    public void syncParentsDivorce(TaskParamDomain domain) {
+        RiskTask task = createTask(domain.getPersons().size(), 117);
+        taskRepository.save(task);
+
+        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());
+        Map<String, RiskPersonal> personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal));
+        List<RiskModelTaskClue> toInsert = new ArrayList<>();
+        for (GBaseCSCZRK domicileType : list) {
+            RiskPersonal personal = personalMap.get(domicileType.getGmsfhm());
+            if (personal == null) continue;
+            if (idCode.get(domicileType.getGmsfhm()) != null) continue;
+            if (oldMap.get(domicileType.getGmsfhm()) != null) continue;
+
+            idCode.put(domicileType.getGmsfhm(), 1);
+            ClueData data = ClueData.builder()
+                    .name(personal.getName())
+                    .id(personal.getId().toString())
+                    .idCode(personal.getIdCode())
+                    .tag("父母婚姻变故")
+                    .personId(personal.getId())
+                    .sourceData("发现该人员父母离婚，增加风险分5分")
+                    .build();
+            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+        }
+        if (!toInsert.isEmpty()) {
+            modelTaskClueService.saveClues(toInsert, Default.PARENTSDIVORCE);
+        }
+        RiskTask updateTask = new RiskTask();
+        updateTask.setId(task.getId());
+        updateTask.setInsertSize(toInsert.size());
+        updateTask.setUpdateSize(0);
+        updateTask.setState(1);
+        updateTask.setEndTime(LocalDateTime.now());
+        taskRepository.updateById(updateTask);
+    }
+
+    @Override
+    public void syncFamilyDie(TaskParamDomain domain) {
+        /*
+        RiskTask task = createTask(domain.getPersons().size(), 118);
+        taskRepository.save(task);
+
+        Map<String, RiskModelTaskClue> oldMap = domain.getOldMap(task.getModelId(), true);
+        Map<String, Integer> idCode = new HashMap<>();
+        List<GBaseCSCZRK> list = new ArrayList<>();
+        log.info("模型118开始查询");
+        for (List<String> idCard : domain.getIdCards()) {
+//            list.addAll(cSCZRKRepository.getBaseMapper().selectDomicileType(idCard));
+        }
+        log.info("模型118查询结果数：{}", 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 (GBaseCSCZRK domicileType : list) {
+            RiskPersonal personal = personalMap.get(domicileType.getGmsfhm());
+            if (personal == null) continue;
+            if (idCode.get(domicileType.getGmsfhm()) != null) continue;
+            if (oldMap.get(domicileType.getGmsfhm()) != null) continue;
+
+            idCode.put(domicileType.getGmsfhm(), 1);
+            ClueData data = ClueData.builder()
+                    .name(personal.getName())
+                    .id(personal.getId().toString())
+                    .idCode(personal.getIdCode())
+                    .tag("亲近家人死亡")
+                    .personId(personal.getId())
+                    .sourceData("发现该人员亲近家人死亡，增加风险分5分")
+                    .build();
+            toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
+        }
+        if (!toInsert.isEmpty()) {
+            modelTaskClueService.saveClues(toInsert, Default.FAMILYDIE);
+        }
+        RiskTask updateTask = new RiskTask();
+        updateTask.setId(task.getId());
+        updateTask.setInsertSize(toInsert.size());
+        updateTask.setUpdateSize(0);
+        updateTask.setState(1);
+        updateTask.setEndTime(LocalDateTime.now());
+        taskRepository.updateById(updateTask);
+        */
+    }
+
     @Override
     public void syncDomicileType(TaskParamDomain domain) {
         RiskTask task = createTask(domain.getPersons().size(), 114);