From 8be4f569d194d550f89153576f18a450c83cffc1 Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Sat, 7 Dec 2024 18:45:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E6=9A=B4=E4=B8=8E=E8=A2=AB=E5=AE=B6?= =?UTF-8?q?=E6=9A=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/ApplicationEvent.java | 19 +++++++++++-------- .../service/impl/GBaseJJDServiceImpl.java | 8 ++++---- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index 46cc16b..72aefad 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/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)));// 未完成 // *********暂时不要********** diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java index 1b48c29..cd1a142 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java @@ -375,8 +375,8 @@ public class GBaseJJDServiceImpl implements GBaseJJDService { List jjdList; List 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 collectionClue(Map> idCode, Map> mobile,RiskPersonal personal,Map> personOldMap, RiskTask task, String tag) { - List jjdList = Optional.of(idCode.get(personal.getIdCode())).orElse(new ArrayList<>()); - jjdList.addAll(Optional.of(mobile.get(personal.getMobileNumber())).orElse(new ArrayList<>())); + List 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<>(); }