人员

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

@@ -101,38 +101,46 @@ public class ApplicationEvent {
         LocalDateTime start = LocalDateTime.of(2024, 1, 1, 0, 0, 0);
         LocalDateTime end = LocalDateTime.now();
         CompletableFutureUtil.runSync(() -> {
+            personalService.init();
             gBaseJJDService.pullAndSave(start, end);
             gBaseSHRWFRService.pullAndSave(start, end);
             petitionService.personPullAndSave(start, end);
             pointService.personPullAndSave(start, end);
             riskPersonalService.fixed();
 
+            riskTaskService.heightFight(initDomain(List.of(42)));
+            petitionService.petitionModelTask(initDomain(List.of(40)));
+            riskTaskService.eduModelTask(initDomain(List.of(34)));
+            riskTaskService.infoModelTask(initDomain(List.of(32,33)));
+            riskTaskService.caseModelTask(initDomain(List.of(35)));
+            pointService.syncSecurity(initDomain(List.of(37)));
+            policeService.contradictModelTask(initDomain(List.of(38)));
+            habitService.habitModelTask(initDomain(List.of(36)));
+            marriageService.marriageModelTask(initDomain(List.of(39,51)));
+            pointService.syncCarUser(initDomain(List.of(53)));
+            riskTaskService.riskAreaModelTask(initDomain(List.of(41)));
+            pointService.syncScore(initDomain(List.of(43)));
+            pointService.syncViolence(initDomain(List.of(44)));
+            noControlService.syncNoControlData(initDomain(List.of(45,49)));
+            pointService.syncKillSelf(initDomain(List.of(46)));
+            pointService.syncDrug(initDomain(List.of(37)));
+            pointService.syncControlNoPower(initDomain(List.of(48)));
+            pointService.syncPointCall(initDomain(List.of(50)));
+            pointService.syncOilBuy(initDomain(List.of(52)));
+            //暂时废弃该保安
+            //gBaseBAService.baModelTask(initDomain(List.of(37)));
+            //personalService.syncOrg();
+        });
+    }
+
+    TaskParamDomain initDomain(List<Integer> modelIds) {
         List<RiskPersonal> persons = riskPersonalRepository.list();
         List<RiskModelTaskClue> clues = riskModelTaskClueRepository.list(new LambdaQueryWrapper<RiskModelTaskClue>()
+                .in(RiskModelTaskClue::getModelId, modelIds)
                 .eq(RiskModelTaskClue::getDel, 0));
         Map<Integer, List<RiskModelTaskClue>> map = clues.stream().collect(Collectors.groupingBy(RiskModelTaskClue::getModelId));
         TaskParamDomain domain = new TaskParamDomain(persons, map);
-            petitionService.petitionModelTask(domain);
-            riskTaskService.heightFight(domain);
-            riskTaskService.eduModelTask(domain);
-            riskTaskService.infoModelTask(domain);
-            riskTaskService.caseModelTask(domain);
-            gBaseBAService.baModelTask(domain);
-            policeService.contradictModelTask(domain);
-            habitService.habitModelTask(domain);
-            marriageService.marriageModelTask(domain);
-
-            riskTaskService.riskAreaModelTask(domain);
-            pointService.syncScore(domain);
-            pointService.syncViolence(domain);
-            noControlService.syncNoControlData(domain);
-            pointService.syncKillSelf(domain);
-            pointService.syncDrug(domain);
-//            riskPersonalService.fixed2();
-            pointService.syncControlNoPower(domain);
-            pointService.syncPointCall(domain);
-//            personalService.syncOrg();
-        });
+        return domain;
     }
 
     @PreDestroy

src/main/java/com/biutag/supervisiondata/mapper/ads/GBaseSYRKXXMapper.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.biutag.supervisiondata.pojo.database.Contradiction;
 import com.biutag.supervisiondata.pojo.domain.FightMan;
 import com.biutag.supervisiondata.pojo.entity.ads.GBaseSYRKXX;
-import com.biutag.supervisiondata.pojo.entity.dwd.GBaseWFRXX;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 

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

@@ -24,8 +24,17 @@ public interface PersonalService {
      */
     void pullContradictionInfo(LocalDateTime start);
 
+    /**
+     * 信访三张表
+     */
     void pullPetition(LocalDateTime start);
 
+    /**
+     * 犯罪人
+     */
+    void pullCriminal(LocalDateTime start);
+
+
 
     void init();
 }

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

@@ -196,6 +196,7 @@ public class PersonalServiceImpl implements PersonalService {
     @Override
     public void pullContradictionInfo(LocalDateTime start) {
         LocalDateTime now = LocalDateTime.now();
+        // 矛盾纠纷当事人
         List<Contradiction> list = gBaseSYRKXXRepository.getBaseMapper().selectContradiction(start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         List<String> idCode = list.stream().map(Contradiction::getGmsfhm).distinct().toList();
         // 切割
@@ -272,6 +273,11 @@ public class PersonalServiceImpl implements PersonalService {
         riskPersonalService.saveDistinct(personals);
     }
 
+    @Override
+    public void pullCriminal(LocalDateTime start) {
+
+    }
+
     private final RiskTestRepository riskTestRepository;
 
     @Override