家暴与被家暴

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

@@ -99,7 +99,7 @@ public class ApplicationEvent {
     public void serviceReady() {
         RedisDao.getInstance().init(redisTemplate);
 
-        LocalDateTime start = LocalDateTime.of(2024, 1, 1, 0, 0, 0);
+        LocalDateTime start = LocalDateTime.of(2023, 12, 6, 0, 0, 0);
         LocalDateTime end = LocalDateTime.now();
         CompletableFutureUtil.runSync(() -> {
             // 测试数据
@@ -118,7 +118,7 @@ public class ApplicationEvent {
 //
 //            gBaseJJDService.pullPoliceInstance(start, end);
 //
-
+//
 //            petitionService.petitionModelTask(initDomain(List.of(40)));
 //            riskTaskService.eduModelTask(initDomain(List.of(34)));
 //            riskTaskService.infoModelTask(initDomain(List.of(32,33)));
@@ -126,8 +126,8 @@ public class ApplicationEvent {
 //            riskTaskService.caseModelTask(initDomain(List.of(35)));
 //            pointService.syncSecurity(initDomain(List.of(37)));
 //            policeService.contradictModelTask(initDomain(List.of(38)));
-//            habitService.habitModelTask(initDomain(List.of(36,60,61,62)));
-
+//            habitService.habitModelTask(start, initDomain(List.of(36,60,61,62)));
+//
 //            pointService.syncCarUser(initDomain(List.of(53)));
 //            riskTaskService.riskAreaModelTask(initDomain(List.of(41)));
 //            pointService.syncScore(initDomain(List.of(43)));
@@ -138,17 +138,20 @@ public class ApplicationEvent {
 //            pointService.syncControlNoPower(initDomain(List.of(48)));
 //            pointService.syncOilBuy(initDomain(List.of(52)));
 //            jsbryService.syncPys(initDomain(List.of(59)));
-
+//            gBaseSHRWFRService.combatCrime(initDomain(List.of(63)));
+//            gBaseJJDService.syncPoliceAttack(initDomain(List.of(64)));
+//            gBaseJJDService.syncHomeViolence(initDomain(List.of(65,66)));
 //            pointService.syncIsPetition(initDomain(List.of(111)));
 //            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.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)));
             pointService.syncMotherDie(initDomain(List.of(120)));
+
 //            pointService.syncChildrenNo(initDomain(List.of(120)));// 未完成
 
             // *********暂时不要**********

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

@@ -375,8 +375,8 @@ public class GBaseJJDServiceImpl implements GBaseJJDService {
         List<GBaseJJD> jjdList;
         List<RiskModelTaskClue> toInsert = new ArrayList<>();
         for (RiskPersonal person : domain.getPersons()) {
-            jjdList = Optional.of(idCodeMap.get(person.getIdCode())).orElse(new ArrayList<>());
-            jjdList.addAll(Optional.of(mobileMap.get(person.getMobileNumber())).orElse(new ArrayList<>()));
+            jjdList = Optional.ofNullable(idCodeMap.get(person.getIdCode())).orElse(new ArrayList<>());
+            jjdList.addAll(Optional.ofNullable(mobileMap.get(person.getMobileNumber())).orElse(new ArrayList<>()));
             if (jjdList.isEmpty()) {
                 continue;
             }
@@ -555,8 +555,8 @@ public class GBaseJJDServiceImpl implements GBaseJJDService {
      * @return 要新增的clue
      */
     List<RiskModelTaskClue> collectionClue(Map<String, List<GBaseJJD>> idCode, Map<String, List<GBaseJJD>> mobile,RiskPersonal personal,Map<String, List<RiskModelTaskClue>> personOldMap, RiskTask task, String tag) {
-        List<GBaseJJD> jjdList = Optional.of(idCode.get(personal.getIdCode())).orElse(new ArrayList<>());
-        jjdList.addAll(Optional.of(mobile.get(personal.getMobileNumber())).orElse(new ArrayList<>()));
+        List<GBaseJJD> jjdList = Optional.ofNullable(idCode.get(personal.getIdCode())).orElse(new ArrayList<>());
+        jjdList.addAll(Optional.ofNullable(mobile.get(personal.getMobileNumber())).orElse(new ArrayList<>()));
         if (jjdList.isEmpty()) {
             return new ArrayList<>();
         }