diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index 161697e..ec04030 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -105,7 +105,7 @@ public class ApplicationEvent { DepartUtil.init(ryRepository, departRepository); LocalDateTime end = LocalDate.now().minusDays(1).atTime(23,59,59); CompletableFutureUtil.runSync(() -> { - personalService.init(List.of(118)); + personalService.init(List.of(115,116)); // personalService.pullInvestigate(); // personalService.pullPsychosis(); // gBaseSHRWFRService.pullAndSave(LocalDateTime.of(2019,12,6,0,0,0), end); @@ -114,7 +114,7 @@ public class ApplicationEvent { // pointService.personPullAndSave(); // gBaseJJDService.pullAndSave(LocalDateTime.of(2023, 12, 6, 0, 0, 0), end); // riskPersonalService.fixed(); - personalService.syncPerson(LocalDate.now()); +// personalService.syncPerson(LocalDate.now()); // petitionService.petitionModelTask(initDomain(List.of(40))); // riskTaskService.eduAndAreaModelTask(initDomain(List.of(34,41))); @@ -146,11 +146,11 @@ 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))); // gBaseJJDService.syncOtherContradict(initDomain(List.of(75))); - pointService.syncFamilyDie(initDomain(List.of(118))); +// pointService.syncFamilyDie(initDomain(List.of(118))); // pointService.syncFatherDie(initDomain(List.of(119))); // pointService.syncMotherDie(initDomain(List.of(120))); // pointService.syncChildNo(initDomain(List.of(121))); diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java index 8efcda6..976288d 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java @@ -332,8 +332,7 @@ public class PointServiceImpl implements PointService { @Override public void syncAdministrativePunishment(TaskParamDomain domain) { - RiskTask task = createTask(domain.getPersons().size(), 116); - taskRepository.save(task); + RiskTask task = taskRepository.create(domain.getPersons().size(), 116); Map oldMap = domain.getOldMap(task.getModelId(), true); Map idCode = new HashMap<>(); @@ -353,6 +352,9 @@ public class PointServiceImpl implements PointService { idCode.put(zjhm, 1); int score; + // 去重 + wfrwfxxList = wfrwfxxList.stream().filter(StreamUtil.distinctByKey(GBaseWFRXX::getAjbh)).toList(); + String context = wfrwfxxList.stream().map(GBaseWFRXX::getAjbh).collect(Collectors.joining(",")); score = Math.min(wfrwfxxList.size(), 5); ClueData data = ClueData.builder() @@ -402,6 +404,9 @@ public class PointServiceImpl implements PointService { idCode.put(zjhm, 1); int score; + // 去重 + wfrxxList = wfrxxList.stream().filter(StreamUtil.distinctByKey(GBaseWFRXX::getAjbh)).toList(); + String context = wfrxxList.stream().map(GBaseWFRXX::getAjbh).collect(Collectors.joining(",")); score = Math.min(wfrxxList.size(), 5); ClueData data = ClueData.builder()