From 3ac7f9e69257cff8637ee923b50e07c4657e4f13 Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Wed, 11 Dec 2024 10:40:30 +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 | 31 +++++++++---------- .../mapper/mine/RiskModelTaskClueMapper.java | 5 +++ .../pojo/entity/mine/RiskModelTaskClue.java | 5 +++ .../impl/RiskModelTaskClueServiceImpl.java | 11 ++++--- .../impl/RiskScoreRuleServiceImpl.java | 15 +++++---- 5 files changed, 40 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index 12a79ee..145189d 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -120,7 +120,6 @@ public class ApplicationEvent { // 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))); @@ -146,23 +145,23 @@ public class ApplicationEvent { // 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.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.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/RiskModelTaskClueMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/mine/RiskModelTaskClueMapper.java index 834fa53..7829019 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/mine/RiskModelTaskClueMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/mine/RiskModelTaskClueMapper.java @@ -2,7 +2,9 @@ package com.biutag.supervisiondata.mapper.mine; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.biutag.supervisiondata.pojo.entity.mine.RiskModelTaskClue; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -18,4 +20,7 @@ public interface RiskModelTaskClueMapper extends BaseMapper { @Select(" select distinct id_code from risk_model_task_clue where model_id in (65,66,69,70,72,73,123)") List selectContradictModelIdCode(); + + @Update(" update risk_model_task_clue set score_result = score_calc * #{weight}") + int updateScoreResult(@Param("weight")Double weight); } diff --git a/src/main/java/com/biutag/supervisiondata/pojo/entity/mine/RiskModelTaskClue.java b/src/main/java/com/biutag/supervisiondata/pojo/entity/mine/RiskModelTaskClue.java index b6f23b9..5ffd627 100644 --- a/src/main/java/com/biutag/supervisiondata/pojo/entity/mine/RiskModelTaskClue.java +++ b/src/main/java/com/biutag/supervisiondata/pojo/entity/mine/RiskModelTaskClue.java @@ -90,6 +90,11 @@ public class RiskModelTaskClue implements Serializable { */ @TableField("score_calc") Double scoreCalc; + /** + * 最终分 + */ + @TableField("score_result") + Double scoreResult; /** * 发生时间 */ diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/RiskModelTaskClueServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/RiskModelTaskClueServiceImpl.java index 906e4c1..16dcd26 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/RiskModelTaskClueServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/RiskModelTaskClueServiceImpl.java @@ -135,7 +135,7 @@ public class RiskModelTaskClueServiceImpl implements RiskModelTaskClueService { } } - final String sql = "INSERT INTO risk_model_task_clue(model_id, name, id_code, task_id, source_id, risk_reason, data, score, score_calc, event_time, create_time, update_time, case_ids) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)"; + final String sql = "INSERT INTO risk_model_task_clue(model_id, name, id_code, task_id, source_id, risk_reason, data, score, score_calc, score_result, event_time, create_time, update_time, case_ids) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; public void batchInsert(List alliances, String bigTag, Map ruleMap) { try (Connection connection = getConnection(); @@ -163,10 +163,11 @@ public class RiskModelTaskClueServiceImpl implements RiskModelTaskClueService { prepareStatement.setObject(7, Optional.ofNullable(it.getData()).orElse("")); prepareStatement.setObject(8, Optional.ofNullable(it.getScore()).orElse(0)); prepareStatement.setObject(9, Optional.ofNullable(score.doubleValue()).orElse(0.00)); - prepareStatement.setObject(10, Optional.ofNullable(it.getEventTime()).map(item -> item.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))).orElse(null)); - prepareStatement.setObject(11, Optional.ofNullable(it.getCreateTime()).map(item -> item.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))).orElse(null)); - prepareStatement.setObject(12, Optional.ofNullable(it.getUpdateTime()).map(item -> item.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))).orElse(null)); - prepareStatement.setObject(13, Optional.ofNullable(it.getCaseIds()).orElse("")); + prepareStatement.setObject(10, Optional.ofNullable(score.doubleValue()).orElse(0.00)); + prepareStatement.setObject(11, Optional.ofNullable(it.getEventTime()).map(item -> item.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))).orElse(null)); + prepareStatement.setObject(12, Optional.ofNullable(it.getCreateTime()).map(item -> item.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))).orElse(null)); + prepareStatement.setObject(13, Optional.ofNullable(it.getUpdateTime()).map(item -> item.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))).orElse(null)); + prepareStatement.setObject(14, Optional.ofNullable(it.getCaseIds()).orElse("")); prepareStatement.addBatch(); } catch (SQLException e) { log.error("", e); 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 9b76d1d..433649c 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/RiskScoreRuleServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/RiskScoreRuleServiceImpl.java @@ -49,8 +49,11 @@ public class RiskScoreRuleServiceImpl implements RiskScoreRuleService { if(idCodes != null && !idCodes.isEmpty()) { queryWrapper.in(RiskPersonal::getIdCode, idCodes); } - - BigDecimal we = new BigDecimal(Optional.ofNullable(weight).orElse("1")); + if(weight != null && !weight.equals("1")) { + Double we = Optional.ofNullable(weight).map(Double::valueOf).orElse(1.0); + int result = riskModelTaskClueRepository.getBaseMapper().updateScoreResult(we); + log.info("修改分数"); + } List riskPersonals = personalRepository.list(queryWrapper); List rules = riskScoreRuleRepository.list(new LambdaQueryWrapper<>()); @@ -63,7 +66,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) + .select(RiskModelTaskClue::getIdCode, RiskModelTaskClue::getModelId, RiskModelTaskClue::getScore, RiskModelTaskClue::getScoreResult) .eq(RiskModelTaskClue::getDel, 0)); Map>> clueMap = new HashMap<>(); @@ -103,7 +106,7 @@ 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::getScoreCalc).sum(); + Double ruleScore = temp.stream().mapToDouble(RiskModelTaskClue::getScoreResult).sum(); BigDecimal n2 = new BigDecimal(Double.toString(Math.min(ruleScore, riskScoreRule.getScore()))); score=score.add(n2); } @@ -114,10 +117,10 @@ public class RiskScoreRuleServiceImpl implements RiskScoreRuleService { } //二次改造 // total = total.multiply(new BigDecimal("20")); - if(person.getRickScore().compareTo(total.doubleValue()) != 0) { + if(person.getRickScore() == null || person.getRickScore().compareTo(total.doubleValue()) != 0) { update = new RiskPersonal(); update.setId(person.getId()); - update.setRickScore(total.multiply(we).doubleValue()); + update.setRickScore(total.doubleValue()); toUpdates.add(update); } if(total.doubleValue() <= 0.0) {