From 6b499684ff4a094cc8fbe6395c3966d0029c108a Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Wed, 11 Dec 2024 14:12:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/ApplicationEvent.java | 88 +++++++++---------- .../mapper/dwd/GBaseZDRYMapper.java | 3 + .../service/impl/PointServiceImpl.java | 8 +- .../impl/RiskScoreRuleServiceImpl.java | 3 +- 4 files changed, 50 insertions(+), 52 deletions(-) diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index 145189d..e808e5e 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -102,52 +102,50 @@ public class ApplicationEvent { LocalDateTime start = LocalDateTime.of(2023, 12, 6, 0, 0, 0); LocalDateTime end = LocalDateTime.now(); CompletableFutureUtil.runSync(() -> { - // 测试数据 -// gBaseJJDService.pullDataAndSaveRedis(start, end); -// personalService.init(); -// personalService.pullInvestigate(); -// personalService.pullPsychosis(); -// gBaseJJDService.pullAndSave(start, end); -// gBaseSHRWFRService.pullAndSave(start, end); -// petitionService.personPullAndSave(start, end); -// personalService.pullPetitionAgain(); -// pointService.personPullAndSave(start, end); -// riskPersonalService.fixed(); - -// petitionService.petitionModelTask(initDomain(List.of(40))); -// riskTaskService.eduModelTask(initDomain(List.of(34))); -// riskTaskService.infoModelTask(initDomain(List.of(32,33))); -// marriageService.marriageModelTask(initDomain(List.of(39,51))); -// pointService.syncSecurity(initDomain(List.of(37))); -// 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))); -// pointService.syncViolence(initDomain(List.of(44))); -// noControlService.syncNoControlData(initDomain(List.of(45))); -// pointService.syncDrug(initDomain(List.of(37))); -// pointService.syncControlNoPower(initDomain(List.of(48))); -// pointService.syncOilBuy(initDomain(List.of(52))); -// gBaseJJDService.pullPoliceInstance(start, 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(111))); -// pointService.syncFatherEducation(initDomain(List.of(112))); -// pointService.syncMotherEducation(initDomain(List.of(113))); -// pointService.syncDomicileType(initDomain(List.of(114))); + personalService.init(); + personalService.pullInvestigate(); + personalService.pullPsychosis(); + gBaseJJDService.pullAndSave(start, end); + gBaseSHRWFRService.pullAndSave(start, end); + petitionService.personPullAndSave(start, end); + personalService.pullPetitionAgain(); + pointService.personPullAndSave(start, end); + riskPersonalService.fixed(); + + petitionService.petitionModelTask(initDomain(List.of(40))); + riskTaskService.eduModelTask(initDomain(List.of(34))); + riskTaskService.infoModelTask(initDomain(List.of(32,33))); + marriageService.marriageModelTask(initDomain(List.of(39,51))); + pointService.syncSecurity(initDomain(List.of(37))); + 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))); + pointService.syncViolence(initDomain(List.of(44))); + noControlService.syncNoControlData(initDomain(List.of(45))); + pointService.syncDrug(initDomain(List.of(37))); + pointService.syncControlNoPower(initDomain(List.of(48))); + pointService.syncOilBuy(initDomain(List.of(52))); + gBaseJJDService.pullPoliceInstance(start, 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(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.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))); diff --git a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseZDRYMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseZDRYMapper.java index 75e87d7..26cff87 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseZDRYMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseZDRYMapper.java @@ -86,6 +86,9 @@ public interface GBaseZDRYMapper extends BaseMapper { "") List syncCarUser(@Param("list")List list); + @Select(" select distinct dwd_zjhm from dwd_wp_jtqbglpt_jdcjbxx where (length(dwd_zjhm) = 18 or length(dwd_zjhm) = 15) and dwd_zjlx = 'A' and ztdm is not null and ztdm not in ( 'B','K','E') ") + List syncCarUser2(); + /** * 获取重点人员的组织机构 * @return 列表 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 53b4eab..277fb82 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java @@ -1637,12 +1637,8 @@ public class PointServiceImpl implements PointService { @Override public void syncCarUser(TaskParamDomain domain) { - int count = domain.getIdCards().size(); - List carUsers = new ArrayList<>(); - for (List idCard : domain.getIdCards()) { - carUsers.addAll(zdryRepository.getBaseMapper().syncCarUser(idCard)); - log.info("车主进度：{}", --count); - } + List carUsers = zdryRepository.getBaseMapper().syncCarUser2(); + log.info("车主数量：{}", carUsers.size()); RiskTask task = createTask(carUsers.size(), 53); taskRepository.save(task); 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 433649c..c4ebe66 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/RiskScoreRuleServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/RiskScoreRuleServiceImpl.java @@ -107,7 +107,8 @@ public class RiskScoreRuleServiceImpl implements RiskScoreRuleService { // BigDecimal weight = new BigDecimal(Double.toString(riskScoreRule.getWeight())); // n2 = n2.multiply(weight).divide(new BigDecimal("100"), 2, RoundingMode.UP); Double ruleScore = temp.stream().mapToDouble(RiskModelTaskClue::getScoreResult).sum(); - BigDecimal n2 = new BigDecimal(Double.toString(Math.min(ruleScore, riskScoreRule.getScore()))); + BigDecimal rScore = new BigDecimal(riskScoreRule.getScore().toString()).multiply(new BigDecimal(weight)); + BigDecimal n2 = new BigDecimal(Double.toString(Math.min(ruleScore, rScore.doubleValue()))); score=score.add(n2); } // BigDecimal ruleScore = new BigDecimal(Double.toString(rule.getScore()));