From 219fe269fe07993f19ea4ececc47b15256003578 Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Mon, 16 Dec 2024 21:32:12 +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 | 106 +++++++++--------- .../service/impl/MarriageServiceImpl.java | 12 +- .../service/impl/PersonalServiceImpl.java | 1 + .../service/impl/RiskPersonalServiceImpl.java | 3 + .../impl/RiskScoreRuleServiceImpl.java | 2 +- .../service/impl/RiskTaskServiceImpl.java | 2 +- 6 files changed, 65 insertions(+), 61 deletions(-) diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index 94c9507..d0b653e 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,58 +111,58 @@ public class ApplicationEvent { // gBaseJJDService.pullAndSave(LocalDateTime.of(2023, 12, 6, 0, 0, 0), end); // riskPersonalService.fixed(); // personalService.syncPerson(LocalDate.now()); - 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))); - 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))); - // 必须在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))); - pointService.syncXIDUDriver(initDomain(List.of(133))); +// 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.syncOilB uy(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))); +// 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))); // 12-16报错 +// 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))); +// pointService.syncXIDUDriver(initDomain(List.of(133))); // *********暂时不要********** // riskTaskService.heightFight(initDomain(List.of(42))); // pointService.syncKillSelf(initDomain(List.of(46))); diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java index d11603f..715872f 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java @@ -48,8 +48,8 @@ public class MarriageServiceImpl implements MarriageService { Map dataMap = data.stream().collect(Collectors.toMap(WdpcGrjdHyqkb::getIdCode, Function.identity(), (val, old) -> val)); log.info("开始查询结婚数据：{}", dataMap.size()); - Map old1 = domain.getOldMap(39, true); - Map old2 = domain.getOldMap(51, true); + Map old1 = domain.getOldMap(task.getModelId(), true); + Map old2 = domain.getOldMap(task2.getModelId(), true); List toInsert1 = new ArrayList<>(); @@ -77,7 +77,7 @@ public class MarriageServiceImpl implements MarriageService { } catch (Exception e) { clueData.setEventTime(LocalDateTime.now()); } - toInsert1.add(DataUtil.createClueData(task, clueData)); + toInsert1.add(DataUtil.createClueData(task2, clueData)); if(clueData.getEventTime().isBefore(yearsDate) || old2.get(person.getIdCode()) != null) { continue; } @@ -95,7 +95,7 @@ public class MarriageServiceImpl implements MarriageService { } catch (Exception e) { clueData2.setEventTime(LocalDateTime.now()); } - toInsert2.add(DataUtil.createClueData(task2, clueData2)); + toInsert2.add(DataUtil.createClueData(task, clueData2)); } List toUpdate = new ArrayList<>(); @@ -114,7 +114,7 @@ public class MarriageServiceImpl implements MarriageService { log.info("新增离婚数据：{}", toInsert1.size()); riskModelTaskClueService.saveClues(toInsert1, "婚姻状态"); } - riskTaskRepository.updateTask(task.getId(), toInsert1.size(), 0); + riskTaskRepository.updateTask(task2.getId(), toInsert1.size(), 0); if(!toInsert2.isEmpty()) { log.info("新增个人婚姻创伤：{}", toInsert2.size()); @@ -124,6 +124,6 @@ public class MarriageServiceImpl implements MarriageService { log.info("修改个人婚姻创伤：{}", toUpdate.size()); riskModelTaskClueService.deleteCluesAndDeleteTag(toUpdate, idCodes, "个人婚姻创伤"); } - riskTaskRepository.updateTask(task.getId(), toInsert1.size(), toUpdate.size()); + riskTaskRepository.updateTask(task.getId(), toInsert2.size(), toUpdate.size()); } } diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java index 12aa329..af3409b 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java @@ -486,6 +486,7 @@ public class PersonalServiceImpl implements PersonalService { @Override public void init() { +// riskTestRepository.getBaseMapper().truncatePerson(); riskTestRepository.getBaseMapper().truncateClue(); riskTestRepository.getBaseMapper().truncateTag(); riskTestRepository.getBaseMapper().truncateTask(); diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/RiskPersonalServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/RiskPersonalServiceImpl.java index ca58ae4..eb6ff99 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/RiskPersonalServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/RiskPersonalServiceImpl.java @@ -52,6 +52,9 @@ public class RiskPersonalServiceImpl implements RiskPersonalService { @Override public void formatAndSave(List list, String bigTag) { List searchOldCode = new ArrayList<>(); + for (RiskPersonal riskPersonal : list) { + riskPersonal.setIdCode(riskPersonal.getIdCode().toUpperCase()); + } list.stream().map(RiskPersonal::getIdCode).distinct().forEach(searchOldCode::add); // 速度是割出来的 List> olds = IntStream.range(0, (searchOldCode.size() + 9999) / 10000) diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/RiskScoreRuleServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/RiskScoreRuleServiceImpl.java index b70f52a..dda7310 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/RiskScoreRuleServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/RiskScoreRuleServiceImpl.java @@ -63,7 +63,7 @@ public class RiskScoreRuleServiceImpl implements RiskScoreRuleService { Map modelMap = models.stream().collect(Collectors.toMap(Model::getRiskScoreRuleId, Function.identity(), (oldValue, newValue) -> newValue)); List clues = riskModelTaskClueRepository.list(new LambdaQueryWrapper() - .select(RiskModelTaskClue::getIdCode, RiskModelTaskClue::getModelId, RiskModelTaskClue::getScore, RiskModelTaskClue::getScoreResult) + .select(RiskModelTaskClue::getIdCode, RiskModelTaskClue::getModelId, RiskModelTaskClue::getScore, RiskModelTaskClue::getScoreCalc) .eq(RiskModelTaskClue::getDel, 0)); log.info("1、修改每项得分\n2、修改人员总分"); log.info("1、计算分项倍分"); diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java index a218987..6827bf4 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/RiskTaskServiceImpl.java @@ -194,7 +194,7 @@ public class RiskTaskServiceImpl implements RiskTaskService { if(!areCode.contains(xx.getCsdxzqhdm())) { continue; } - toInsert2.add(DataUtil.createClueData(eduTask, ClueData.builder() + toInsert2.add(DataUtil.createClueData(areaTask, ClueData.builder() .id(BhUtil.sfBh(person.getId().toString())) .score(5) .personId(person.getId())