Merge remote-tracking branch 'origin/master'

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

@@ -135,7 +135,7 @@ public class ApplicationEvent {
 //            pointService.syncDrug(initDomain(List.of(37)));
 //            pointService.syncControlNoPower(initDomain(List.of(48)));
 //            pointService.syncOilBuy(initDomain(List.of(52)));
-            gBaseJJDService.pullPoliceInstance(start, end, initDomain(List.of(55,56,57,58)));
+//            gBaseJJDService.pullPoliceInstance(start, end, initDomain(List.of(55,56,57,58)));
 //            jsbryService.syncPys(initDomain(List.of(59)));
 //            gBaseSHRWFRService.combatCrime(initDomain(List.of(63)));
 //            gBaseJJDService.syncPoliceAttack(initDomain(List.of(64)));
@@ -161,6 +161,9 @@ public class ApplicationEvent {
             pointService.syncChildNo(initDomain(List.of(121)));
             pointService.syncXIDU(initDomain(List.of(122)));
             pointService.syncFiliation(initDomain(List.of(123)));
+            // 必须在123后面
+            gBaseJJDService.syncOtherContradict(initDomain(List.of(75)));
+
             pointService.syncPetitionContent(initDomain(List.of(124)));
 
             // *********暂时不要**********

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

@@ -307,60 +307,48 @@ public class GBaseJJDServiceImpl implements GBaseJJDService {
         String startTime = start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         String endTime = end.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
 
-        List<RiskModelTaskClue> list1 = new ArrayList<>();
-        List<RiskModelTaskClue> list2 = new ArrayList<>();
-        List<RiskModelTaskClue> list3 = new ArrayList<>();
-        List<RiskModelTaskClue> list4 = new ArrayList<>();
-        List<Integer> tasks = new ArrayList<>(4);
         CompletableFuture.allOf(
                 CompletableFutureUtil.runSyncObject(() -> {
                     List<GBaseJJD> jjdList = gBaseJJDRepository.getBaseMapper().selectRevenge(startTime, endTime);
                     RiskTask task = taskRepository.create(jjdList.size(), 58);
-                    list1.addAll(collectJJD(task, "表达报复社会", jjdList, domain));
-                    tasks.set(0, task.getId());
+                    List<RiskModelTaskClue> list =collectJJD(task, "表达报复社会", jjdList, domain);
+                    if (!list.isEmpty()) {
+                        log.info("保存复仇者联盟：{}", list.size());
+                        clueService.saveClues(list, "表达报复社会");
+                    }
+                    taskRepository.updateTask(task.getId(), list.size(), 0);
                 }),
                 CompletableFutureUtil.runSyncObject(() -> {
                     List<GBaseJJD> jjdList = gBaseJJDRepository.getBaseMapper().selectHater(startTime, endTime);
                     RiskTask task = taskRepository.create(jjdList.size(), 55);
-                    list2.addAll(collectJJD(task, "表达厌世情绪", gBaseJJDRepository.getBaseMapper().selectHater(startTime, endTime), domain));
-                    tasks.set(1, task.getId());
+                    List<RiskModelTaskClue> list = collectJJD(task, "表达厌世情绪", jjdList, domain);
+                    if (!list.isEmpty()) {
+                        log.info("厌世强者：{}", list.size());
+                        clueService.saveClues(list, "表达厌世情绪");
+                    }
+                    taskRepository.updateTask(task.getId(), list.size(), 0);
                 }),
                 CompletableFutureUtil.runSyncObject(() -> {
                     List<GBaseJJD> jjdList = gBaseJJDRepository.getBaseMapper().selectInjustice(startTime, endTime);
                     RiskTask task = taskRepository.create(jjdList.size(), 57);
-                    list3.addAll(collectJJD(task, "表达遭受不公", gBaseJJDRepository.getBaseMapper().selectInjustice(startTime, endTime), domain));
-                    tasks.set(2, task.getId());
+                    List<RiskModelTaskClue> list = collectJJD(task, "表达遭受不公", jjdList, domain);
+                    if (!list.isEmpty()) {
+                        log.info("我命由我不由天：{}", list.size());
+                        clueService.saveClues(list, "表达遭受不公");
+                    }
+                    taskRepository.updateTask(task.getId(), list.size(), 0);
                 }),
                 CompletableFutureUtil.runSyncObject(() -> {
                     List<GBaseJJD> jjdList = gBaseJJDRepository.getBaseMapper().selectSuicide(startTime, endTime);
                     RiskTask task = taskRepository.create(jjdList.size(), 56);
-                    list4.addAll(collectJJD(task, "尝试自杀", gBaseJJDRepository.getBaseMapper().selectSuicide(startTime, endTime), domain));
-                    tasks.set(3, task.getId());
+                    List<RiskModelTaskClue> list = collectJJD(task, "尝试自杀", jjdList, domain);
+                    if (!list.isEmpty()) {
+                        log.info("毁灭吧：{}", list.size());
+                        clueService.saveClues(list, "尝试自杀");
+                    }
+                    taskRepository.updateTask(task.getId(), list.size(), 0);
                 })
         ).join();
-
-
-        if (!list1.isEmpty()) {
-            log.info("保存复仇者联盟：{}", list1.size());
-            clueService.saveClues(list1, "表达报复社会");
-        }
-        if (!list2.isEmpty()) {
-            log.info("厌世强者：{}", list2.size());
-            clueService.saveClues(list2, "表达厌世情绪");
-        }
-        if (!list3.isEmpty()) {
-            log.info("我命由我不由天：{}", list3.size());
-            clueService.saveClues(list3, "表达遭受不公");
-        }
-        if (!list4.isEmpty()) {
-            log.info("毁灭吧：{}", list4.size());
-            clueService.saveClues(list4, "尝试自杀");
-        }
-        taskRepository.updateTask(tasks.get(0), list1.size(), 0);
-        taskRepository.updateTask(tasks.get(1), list2.size(), 0);
-        taskRepository.updateTask(tasks.get(2), list3.size(), 0);
-        taskRepository.updateTask(tasks.get(3), list4.size(), 0);
-
     }
 
     private final RiskTaskRepository taskRepository;