diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index 6aea114..12a79ee 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -104,65 +104,65 @@ public class ApplicationEvent { 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))); - 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))); +// 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.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))); // *********暂时不要********** // riskTaskService.caseModelTask(initDomain(List.of(35))); diff --git a/src/main/java/com/biutag/supervisiondata/mapper/mine/RiskScoreRuleMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/mine/RiskScoreRuleMapper.java index 4897c2c..a5ef0e1 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/mine/RiskScoreRuleMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/mine/RiskScoreRuleMapper.java @@ -20,6 +20,7 @@ public interface RiskScoreRuleMapper extends BaseMapper { " " + " #{item}" + " " + + " ) " + "") List selectRuleByModelId(@Param("list")List list); } diff --git a/src/main/java/com/biutag/supervisiondata/rest/ApiController.java b/src/main/java/com/biutag/supervisiondata/rest/ApiController.java index 7d73466..17a646f 100644 --- a/src/main/java/com/biutag/supervisiondata/rest/ApiController.java +++ b/src/main/java/com/biutag/supervisiondata/rest/ApiController.java @@ -38,7 +38,7 @@ public class ApiController { private final ModelClueService modelClueService; @GetMapping("/score") - public RS score(String idCodes) { + public RS score(String idCodes, String weight) { if(LocalLock.scoreLock){ return RS.error("正在进行中"); } @@ -46,9 +46,9 @@ public class ApiController { CompletableFutureUtil.runSync(() -> { try { if(idCodes == null) { - riskScoreRuleService.runScore(new ArrayList<>()); + riskScoreRuleService.runScore(new ArrayList<>(), weight); } else { - riskScoreRuleService.runScore(List.of(idCodes.split(","))); + riskScoreRuleService.runScore(List.of(idCodes.split(",")), weight); } } catch (Exception e) { log.error("", e); diff --git a/src/main/java/com/biutag/supervisiondata/service/RiskScoreRuleService.java b/src/main/java/com/biutag/supervisiondata/service/RiskScoreRuleService.java index f62f6c2..c8a44f0 100644 --- a/src/main/java/com/biutag/supervisiondata/service/RiskScoreRuleService.java +++ b/src/main/java/com/biutag/supervisiondata/service/RiskScoreRuleService.java @@ -9,5 +9,5 @@ import java.util.List; */ public interface RiskScoreRuleService { - void runScore(List idCodes); + void runScore(List idCodes,String weight); } 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 8909e0c..23ed0f2 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/MarriageServiceImpl.java @@ -56,7 +56,6 @@ public class MarriageServiceImpl implements MarriageService { LocalDateTime yearsDate = LocalDateTime.now().minusYears(1); RiskTask task = riskTaskRepository.create(data.size(), 39); RiskTask task2 = riskTaskRepository.create(data.size(), 51); - riskTaskRepository.saveBatch(List.of(task,task2)); Map dataMap = data.stream().collect(Collectors.toMap(WdpcGrjdHyqkb::getIdCode, Function.identity(), (val, old) -> val)); log.info("开始查询结婚数据：{}", domain.getIdCards().size()); 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 02dffb3..9b76d1d 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/RiskScoreRuleServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/RiskScoreRuleServiceImpl.java @@ -43,13 +43,15 @@ public class RiskScoreRuleServiceImpl implements RiskScoreRuleService { private final RiskModelTaskClueRepository riskModelTaskClueRepository; @Override - public void runScore(List idCodes) { + public void runScore(List idCodes, String weight) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .select(RiskPersonal::getIdCode, RiskPersonal::getId, RiskPersonal::getRickScore); if(idCodes != null && !idCodes.isEmpty()) { queryWrapper.in(RiskPersonal::getIdCode, idCodes); } + BigDecimal we = new BigDecimal(Optional.ofNullable(weight).orElse("1")); + List riskPersonals = personalRepository.list(queryWrapper); List rules = riskScoreRuleRepository.list(new LambdaQueryWrapper<>()); @@ -115,7 +117,7 @@ public class RiskScoreRuleServiceImpl implements RiskScoreRuleService { if(person.getRickScore().compareTo(total.doubleValue()) != 0) { update = new RiskPersonal(); update.setId(person.getId()); - update.setRickScore(total.doubleValue()); + update.setRickScore(total.multiply(we).doubleValue()); toUpdates.add(update); } if(total.doubleValue() <= 0.0) {