From 33853fa1080521ed6e2fe91753b2697fb9fb58a0 Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Mon, 16 Dec 2024 18:11:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=92=8C=E9=A3=8E=E9=99=A9=E9=A1=B9=E7=9A=84=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/ApplicationEvent.java | 101 +++++++++--------- .../service/impl/GBaseJJDServiceImpl.java | 2 +- .../service/impl/GBaseSHRWFRServiceImpl.java | 17 --- .../service/impl/PetitionServiceImpl.java | 29 +++-- .../impl/WdpcGrjdJsbryServiceService.java | 18 +--- 5 files changed, 64 insertions(+), 103 deletions(-) diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index 62a33f3..ab2842d 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -101,7 +101,7 @@ public class ApplicationEvent { RedisDao.getInstance().init(redisTemplate); LocalDateTime end = LocalDate.now().minusDays(1).atTime(23,59,59); CompletableFutureUtil.runSync(() -> { -// personalService.init(); + personalService.init(); // personalService.pullInvestigate(); // personalService.pullPsychosis(); // gBaseSHRWFRService.pullAndSave(LocalDateTime.of(2019,12,6,0,0,0), end); @@ -111,60 +111,57 @@ public class ApplicationEvent { // gBaseJJDService.pullAndSave(LocalDateTime.of(2023, 12, 6, 0, 0, 0), end); // riskPersonalService.fixed(); // personalService.syncPerson(LocalDate.now()); - // 32，33，34，39，41，51，53，43，63 - // 36 60 61 62 44 45 48 52 59 64 - // 76 74 73 72 71 70 69 67 66 65 55 56 57 58 68 -// petitionService.petitionModelTask(initDomain(List.of(40))); -// riskTaskService.eduAndAreaModelTask(initDomain(List.of(34,41))); -// riskTaskService.infoModelTask(initDomain(List.of(32,33))); -// marriageService.marriageModelTask(initDomain(List.of(39,51))); - -// habitService.habitModelTask(LocalDateTime.of(2023, 12, 6, 0, 0, 0), initDomain(List.of(36,60,61,62))); -// pointService.syncCarUser(initDomain(List.of(53))); -// pointService.syncScore(initDomain(List.of(43))); -// pointService.syncViolence(initDomain(List.of(44))); -// noControlService.syncNoControlData(initDomain(List.of(45))); - -// pointService.syncControlNoPower(initDomain(List.of(48))); + petitionService.petitionModelTask(initDomain(List.of(40))); + riskTaskService.eduAndAreaModelTask(initDomain(List.of(34,41))); + riskTaskService.infoModelTask(initDomain(List.of(32,33))); + marriageService.marriageModelTask(initDomain(List.of(39,51))); + + habitService.habitModelTask(LocalDateTime.of(2023, 12, 6, 0, 0, 0), initDomain(List.of(36,60,61,62))); + pointService.syncCarUser(initDomain(List.of(53))); + pointService.syncScore(initDomain(List.of(43))); + pointService.syncViolence(initDomain(List.of(44))); + noControlService.syncNoControlData(initDomain(List.of(45))); + + pointService.syncControlNoPower(initDomain(List.of(48))); pointService.syncOilBuy(initDomain(List.of(52))); -// gBaseJJDService.pullPoliceInstance(LocalDateTime.of(2023, 12, 6, 0, 0, 0), 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))); -// gBaseJJDService.syncHomeViolence(initDomain(List.of(65,66))); -// pointService.syncPointType(initDomain(List.of(67))); -// gBaseSHRWFRService.hadWork(initDomain(List.of(68))); -// gBaseJJDService.syncParentRelation(initDomain(List.of(69,70))); -// gBaseJJDService.syncLove(initDomain(List.of(71))); -// gBaseJJDService.syncMarryDispute(initDomain(List.of(72))); -// gBaseJJDService.syncNeighborAndColleagueDispute(initDomain(List.of(73))); -// gBaseJJDService.syncBullying(initDomain(List.of(74))); + gBaseJJDService.pullPoliceInstance(LocalDateTime.of(2023, 12, 6, 0, 0, 0), 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))); + gBaseJJDService.syncHomeViolence(initDomain(List.of(65,66))); + pointService.syncPointType(initDomain(List.of(67))); + gBaseSHRWFRService.hadWork(initDomain(List.of(68))); + gBaseJJDService.syncParentRelation(initDomain(List.of(69,70))); + gBaseJJDService.syncLove(initDomain(List.of(71))); + gBaseJJDService.syncMarryDispute(initDomain(List.of(72))); + gBaseJJDService.syncNeighborAndColleagueDispute(initDomain(List.of(73))); + gBaseJJDService.syncBullying(initDomain(List.of(74))); gBaseSHRWFRService.crimeName(initDomain(List.of(76))); -// pointService.syncIsPetition(initDomain(List.of(40))); -// 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.syncFamilyDie(initDomain(List.of(118))); -// pointService.syncFatherDie(initDomain(List.of(119))); -// pointService.syncMotherDie(initDomain(List.of(120))); -// pointService.syncChildNo(initDomain(List.of(121))); -// pointService.syncXIDU(initDomain(List.of(122))); -// pointService.syncFiliation(initDomain(List.of(123))); + pointService.syncIsPetition(initDomain(List.of(40))); + 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.syncFamilyDie(initDomain(List.of(118))); + pointService.syncFatherDie(initDomain(List.of(119))); + pointService.syncMotherDie(initDomain(List.of(120))); + 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))); -// pointService.syncMedicalPressure(initDomain(List.of(125))); -// pointService.syncSeriousIllness(initDomain(List.of(126))); -// pointService.syncFamilySeriousIllness(initDomain(List.of(127))); -// pointService.syncPetitionDissatisfied(initDomain(List.of(128))); -// pointService.syncIsSpecialPeople(initDomain(List.of(129))); -// pointService.syncSpecialPeopleType(initDomain(List.of(130))); -// pointService.syncParentsRelationship(initDomain(List.of(131))); -// pointService.syncMentalDiseaseDriver(initDomain(List.of(132))); + gBaseJJDService.syncOtherContradict(initDomain(List.of(75))); + + pointService.syncPetitionContent(initDomain(List.of(124))); + pointService.syncMedicalPressure(initDomain(List.of(125))); + pointService.syncSeriousIllness(initDomain(List.of(126))); + pointService.syncFamilySeriousIllness(initDomain(List.of(127))); + pointService.syncPetitionDissatisfied(initDomain(List.of(128))); + pointService.syncIsSpecialPeople(initDomain(List.of(129))); + pointService.syncSpecialPeopleType(initDomain(List.of(130))); + pointService.syncParentsRelationship(initDomain(List.of(131))); + pointService.syncMentalDiseaseDriver(initDomain(List.of(132))); // *********暂时不要********** // riskTaskService.heightFight(initDomain(List.of(42))); // pointService.syncKillSelf(initDomain(List.of(46))); 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 dc55e87..9781e85 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java @@ -1066,7 +1066,7 @@ public class GBaseJJDServiceImpl implements GBaseJJDService { if (!toInsert.isEmpty()) { log.info("其他纠纷：{} ", toInsert.size()); - clueService.saveClues(toInsert, Default.HOME_VIOLENCE); + clueService.saveClues(toInsert,"B57其他矛盾纠纷"); } taskRepository.updateTask(task.getId(), toInsert.size(), 0); } diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseSHRWFRServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseSHRWFRServiceImpl.java index bc79ebf..4b3eb58 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseSHRWFRServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseSHRWFRServiceImpl.java @@ -542,21 +542,4 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService { } return org; } - - RiskModelTaskClue createClue(Integer modelId, Integer score, Integer taskId, ClueData data) { - RiskModelTaskClue clue = new RiskModelTaskClue(); - clue.setModelId(modelId); - clue.setScore(score); - clue.setName(data.getName()); - clue.setIdCode(data.getIdCode()); - clue.setTaskId(taskId); - clue.setData(data.getSourceData()); - clue.setEventTime(data.getEventTime()); - clue.setCreateTime(LocalDateTime.now()); - clue.setUpdateTime(LocalDateTime.now()); - clue.setCaseIds(data.getId()); - clue.setRiskReason(data.getTag()); - return clue; - } - } diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/PetitionServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/PetitionServiceImpl.java index 42d6bcf..ceb80fb 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/PetitionServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/PetitionServiceImpl.java @@ -296,12 +296,12 @@ public class PetitionServiceImpl implements PetitionService { LocalDateTime time = LocalDateTime.now().minusMonths(12); - List dataList1 = new ArrayList<>(); +// List dataList1 = new ArrayList<>(); List dataList2 = new ArrayList<>(); List dataList3 = new ArrayList<>(); CompletableFuture.allOf( - CompletableFutureUtil.runSyncObject(() -> dataList1.addAll(dataCaseVerifRepository.getBaseMapper().selectRiskPerson(time.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))))), +// CompletableFutureUtil.runSyncObject(() -> dataList1.addAll(dataCaseVerifRepository.getBaseMapper().selectRiskPerson(time.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))))), CompletableFutureUtil.runSyncObject(() -> dataList2.addAll(complaintRepository.getBaseMapper().selectRiskPerson(time.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))))), CompletableFutureUtil.runSyncObject(() -> dataList3.addAll(petition12337Repository.getBaseMapper().selectRiskPerson(time.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))))) ).join(); @@ -311,23 +311,20 @@ public class PetitionServiceImpl implements PetitionService { List oldList = Optional.ofNullable(domain.getMap().get(task.getModelId())).orElse(new ArrayList<>()); Map oldMap = oldList.stream().collect(Collectors.toMap(RiskModelTaskClue::getCaseIds, Function.identity(), (val, old) -> val)); - List toInsert1 = new ArrayList<>(createClues(dataList1, oldMap, idCodeMan, task, Default.PETITION_CASE_TAG)); +// List toInsert1 = new ArrayList<>(createClues(dataList1, oldMap, idCodeMan, task, Default.PETITION_CASE_TAG)); List toInsert2 = new ArrayList<>(createClues(dataList2, oldMap, idCodeMan, task, Default.PETITION_TAG)); List toInsert3 = new ArrayList<>(createClues(dataList3, oldMap, idCodeMan, task, Default.PETITION_12337_TAG)); + toInsert2.addAll(toInsert3); - if (!toInsert1.isEmpty()) { - log.info("信访数据1: {}", toInsert1.size()); - riskModelTaskClueService.saveClues(toInsert1, Default.PETITION_CASE_TAG); - } - if (!toInsert2.isEmpty()) { - log.info("信访数据2: {}", toInsert2.size()); - riskModelTaskClueService.saveClues(toInsert2, Default.PETITION_TAG); + Map> map = toInsert2.stream().collect(Collectors.groupingBy(RiskModelTaskClue::getIdCode)); + List toInsert = new ArrayList<>(); + for (Map.Entry> entry : map.entrySet()) { + toInsert.add(entry.getValue().getFirst()); } - if (!toInsert3.isEmpty()) { - log.info("信访数据3: {}", toInsert3.size()); - riskModelTaskClueService.saveClues(toInsert3, Default.PETITION_12337_TAG); + if(!toInsert.isEmpty()) { + riskModelTaskClueService.saveClues(toInsert, "B20是否上访"); } - riskTaskRepository.updateTask(task.getId(), toInsert1.size() + toInsert2.size() + toInsert3.size(), 0); + riskTaskRepository.updateTask(task.getId(), toInsert.size(), 0); } List createClues(List dataList, Map oldMap, Map idCodeMan, RiskTask task, String tag) { @@ -344,8 +341,8 @@ public class PetitionServiceImpl implements PetitionService { .id("") .score(5) .personId(person.getId()) - .tags(List.of(tag)) - .sourceData("该人员在近12个月内有" + tag + "的情况，具体情况为：" + data.getContent()) + .tags(List.of("存在上访")) + .sourceData("该人员存在上访行为") .name(person.getName()) .idCode(person.getIdCode()) .eventTime(null) diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/WdpcGrjdJsbryServiceService.java b/src/main/java/com/biutag/supervisiondata/service/impl/WdpcGrjdJsbryServiceService.java index 782a69d..5229a2f 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/WdpcGrjdJsbryServiceService.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/WdpcGrjdJsbryServiceService.java @@ -81,24 +81,8 @@ public class WdpcGrjdJsbryServiceService implements WdpcGrjdJsbryService { } if(!toInsert.isEmpty()) { - clueService.saveClues(toInsert, "精神心理特征"); + clueService.saveClues(toInsert, "B31是否有精神疾病"); } taskRepository.updateTask(task.getId(), toInsert.size(), 0); } - - RiskModelTaskClue createClue(Integer modelId, Integer score, Integer taskId, ClueData data) { - RiskModelTaskClue clue = new RiskModelTaskClue(); - clue.setModelId(modelId); - clue.setScore(score); - clue.setName(data.getName()); - clue.setIdCode(data.getIdCode()); - clue.setTaskId(taskId); - clue.setData(data.getSourceData()); - clue.setEventTime(data.getEventTime()); - clue.setCreateTime(LocalDateTime.now()); - clue.setUpdateTime(LocalDateTime.now()); - clue.setCaseIds(data.getId()); - clue.setRiskReason(data.getTag()); - return clue; - } }