From 72aec72521e01f24f5d0a42945cb4acc35003cbc Mon Sep 17 00:00:00 2001 From: sjh Date: Mon, 9 Dec 2024 10:57:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E4=BA=BA=E5=AD=90=E5=A5=B3?= =?UTF-8?q?=E6=95=B0=EF=BC=8C=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/ApplicationEvent.java | 10 +-- .../mapper/dwd/GBaseCSCZRKMapper.java | 19 +++++ .../mapper/dwd/GBaseWFRWFXXMapper.java | 2 +- .../pojo/constants/Default.java | 1 + .../pojo/entity/dwd/GBaseCSCZRK.java | 4 ++ .../supervisiondata/service/PointService.java | 3 + .../service/impl/PointServiceImpl.java | 71 ++++++++++++++++++- 7 files changed, 102 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index 46cc16b..4cb01b9 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -142,14 +142,14 @@ public class ApplicationEvent { // 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.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.syncChildrenNo(initDomain(List.of(120)));// 未完成 + pointService.syncChildNo(initDomain(List.of(121))); // *********暂时不要********** // riskTaskService.heightFight(initDomain(List.of(42))); diff --git a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java index 9c030c6..2204e12 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java @@ -79,4 +79,23 @@ public interface GBaseCSCZRKMapper extends BaseMapper { + "" + "") List selectMotherDiePeople(List part); + + // 行为人子女数 + @Select("") + List selectChildNo(List idNos); } diff --git a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRWFXXMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRWFXXMapper.java index ebcc27a..4b3c309 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRWFXXMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRWFXXMapper.java @@ -12,7 +12,7 @@ import java.util.List; * @since 1.8 */ public interface GBaseWFRWFXXMapper extends BaseMapper { - @Select("select a.ajbh, b.zjhm, b.ajmc, b.yjsm, b.djrq from dwd_asj_zfba_ajjbxx a " + + @Select("select a.ajbh, b.zjhm, b.ajmc, b.jysm, b.djrq from dwd_asj_zfba_ajjbxx a " + "join dwd_asj_zfba_wfrwfxx b on a.ajbh = b.ajbh where ajbzdm = 1;") List selectCriminalPunishment(); } diff --git a/src/main/java/com/biutag/supervisiondata/pojo/constants/Default.java b/src/main/java/com/biutag/supervisiondata/pojo/constants/Default.java index deb4a51..065ff27 100644 --- a/src/main/java/com/biutag/supervisiondata/pojo/constants/Default.java +++ b/src/main/java/com/biutag/supervisiondata/pojo/constants/Default.java @@ -124,5 +124,6 @@ public class Default { public static final String MOTHERDIE = "母亲是否健在"; + public static final String CHILDNO = "行为人子女数"; } diff --git a/src/main/java/com/biutag/supervisiondata/pojo/entity/dwd/GBaseCSCZRK.java b/src/main/java/com/biutag/supervisiondata/pojo/entity/dwd/GBaseCSCZRK.java index dfe5484..e7e9973 100644 --- a/src/main/java/com/biutag/supervisiondata/pojo/entity/dwd/GBaseCSCZRK.java +++ b/src/main/java/com/biutag/supervisiondata/pojo/entity/dwd/GBaseCSCZRK.java @@ -84,4 +84,8 @@ public class GBaseCSCZRK implements Serializable { @TableField(exist = false) String motherEducation; + + // 打分（通用SQL计算结果） + @TableField("score") + Integer score; } diff --git a/src/main/java/com/biutag/supervisiondata/service/PointService.java b/src/main/java/com/biutag/supervisiondata/service/PointService.java index bdc8f2e..b83b00a 100644 --- a/src/main/java/com/biutag/supervisiondata/service/PointService.java +++ b/src/main/java/com/biutag/supervisiondata/service/PointService.java @@ -72,4 +72,7 @@ public interface PointService { // 母亲是否健在 void syncMotherDie(TaskParamDomain domain); + + // 行为人子女数 + void syncChildNo(TaskParamDomain domain); } 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 cfddd02..647db50 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java @@ -248,6 +248,7 @@ public class PointServiceImpl implements PointService { Map oldMap = domain.getOldMap(task.getModelId(), true); Map idCode = new HashMap<>(); + log.info("模型116开始查询"); List list = gAXZCFJDSRepository.getBaseMapper().selectAdministrativePunishment(); log.info("模型116查询结果数：{}", list.size()); Map personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal)); @@ -264,6 +265,7 @@ public class PointServiceImpl implements PointService { .id(personal.getId().toString()) .idCode(personal.getIdCode()) .tag("受到行政处罚") + .eventTime(LocalDateTime.now()) .personId(personal.getId()) .sourceData("发现该人员涉及案件“" + domicileType.getAjmc() + "”，案件编号：" + domicileType.getAjbh() + "，处罚内容为“" + domicileType.getCfms1() @@ -290,6 +292,7 @@ public class PointServiceImpl implements PointService { Map oldMap = domain.getOldMap(task.getModelId(), true); Map idCode = new HashMap<>(); + log.info("模型115开始查询"); List list = wFRWFXXRepository.getBaseMapper().selectCriminalPunishment(); log.info("模型115查询结果数：{}", list.size()); Map personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal)); @@ -306,6 +309,7 @@ public class PointServiceImpl implements PointService { .id(personal.getId().toString()) .idCode(personal.getIdCode()) .tag("受到刑事处罚") + .eventTime(LocalDateTime.now()) .personId(personal.getId()) .sourceData("发现该人员" + domicileType.getJysm() + "案件编号：" + domicileType.getAjbh() + "，因受到刑事处罚，增加风险分5分") @@ -351,6 +355,7 @@ public class PointServiceImpl implements PointService { .id(personal.getId().toString()) .idCode(personal.getIdCode()) .tag("父母婚姻变故") + .eventTime(LocalDateTime.now()) .personId(personal.getId()) .sourceData("发现该人员父母离婚，增加风险分5分") .build(); @@ -401,6 +406,7 @@ public class PointServiceImpl implements PointService { .id(personal.getId().toString()) .idCode(personal.getIdCode()) .tag("父亲是否健在") + .eventTime(LocalDateTime.now()) .personId(personal.getId()) .sourceData("发现该人员父亲死亡，增加风险分5分") .build(); @@ -451,6 +457,7 @@ public class PointServiceImpl implements PointService { .id(personal.getId().toString()) .idCode(personal.getIdCode()) .tag("母亲是否健在") + .eventTime(LocalDateTime.now()) .personId(personal.getId()) .sourceData("发现该人员母亲死亡，增加风险分5分") .build(); @@ -468,6 +475,62 @@ public class PointServiceImpl implements PointService { taskRepository.updateById(updateTask); } + @Override + public void syncChildNo(TaskParamDomain domain) { + RiskTask task = createTask(domain.getPersons().size(), 121); + taskRepository.save(task); + + Map oldMap = domain.getOldMap(task.getModelId(), true); + Map idCode = new HashMap<>(); + List list = new ArrayList<>(); + log.info("模型121开始查询"); + for (List idCard : domain.getIdCards()) { + list.addAll(cSCZRKRepository.getBaseMapper().selectChildNo(idCard)); + } + log.info("模型121查询结果数：{}", list.size()); + Map personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal)); + List toInsert = new ArrayList<>(); + for (GBaseCSCZRK domicileType : list) { + RiskPersonal personal = personalMap.get(domicileType.getGmsfhm()); + if (personal == null) continue; + if (idCode.get(domicileType.getGmsfhm()) != null) continue; + if (oldMap.get(domicileType.getGmsfhm()) != null) continue; + + idCode.put(domicileType.getGmsfhm(), 1); + if (domicileType.getScore() == 0){ + continue; + } + int realScore = 0; + if (domicileType.getScore() == 1) { + realScore = 1; + } else if (domicileType.getScore() == 2 || domicileType.getScore() == 3) { + realScore = 3; + } else if (domicileType.getScore() > 3) { + realScore = 5; + } + ClueData data = ClueData.builder() + .name(personal.getName()) + .id(personal.getId().toString()) + .idCode(personal.getIdCode()) + .tag("行为人子女数") + .eventTime(LocalDateTime.now()) + .personId(personal.getId()) + .sourceData("发现该人员子女数为" + domicileType.getScore() + "，增加风险分" + realScore + "分") + .build(); + toInsert.add(createClue(task.getModelId(), realScore, task.getId(), data)); + } + if (!toInsert.isEmpty()) { + modelTaskClueService.saveClues(toInsert, Default.FAMILYDIE); + } + RiskTask updateTask = new RiskTask(); + updateTask.setId(task.getId()); + updateTask.setInsertSize(toInsert.size()); + updateTask.setUpdateSize(0); + updateTask.setState(1); + updateTask.setEndTime(LocalDateTime.now()); + taskRepository.updateById(updateTask); + } + @Override public void syncFamilyDie(TaskParamDomain domain) { RiskTask task = createTask(domain.getPersons().size(), 118); @@ -501,6 +564,7 @@ public class PointServiceImpl implements PointService { .id(personal.getId().toString()) .idCode(personal.getIdCode()) .tag("亲近家人死亡") + .eventTime(LocalDateTime.now()) .personId(personal.getId()) .sourceData("发现该人员亲近家人死亡，增加风险分5分") .build(); @@ -516,7 +580,6 @@ public class PointServiceImpl implements PointService { updateTask.setState(1); updateTask.setEndTime(LocalDateTime.now()); taskRepository.updateById(updateTask); - } @Override @@ -551,8 +614,9 @@ public class PointServiceImpl implements PointService { .id(personal.getId().toString()) .idCode(personal.getIdCode()) .tag("户籍类型") + .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员户籍类型为" + domicileType.getGmsfhm() + "，增加风险分5分") + .sourceData("发现该人员户籍类型为" + domicileType.getHlxmc() + "，增加风险分5分") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -592,6 +656,7 @@ public class PointServiceImpl implements PointService { .id(personal.getId().toString()) .idCode(personal.getIdCode()) .tag("父亲文化程度") + .eventTime(LocalDateTime.now()) .personId(personal.getId()) .sourceData("发现该人员父亲文化程度为" + fatherEducation.getFatherEducation() + "，增加风险分" + eduScore + "分") .build(); @@ -633,6 +698,7 @@ public class PointServiceImpl implements PointService { .id(personal.getId().toString()) .idCode(personal.getIdCode()) .tag("母亲文化程度") + .eventTime(LocalDateTime.now()) .personId(personal.getId()) .sourceData("发现该人员母亲文化程度为" + motherEducation.getMotherEducation() + "，增加风险分" + eduScore + "分") .build(); @@ -694,6 +760,7 @@ public class PointServiceImpl implements PointService { .id(personal.getId().toString()) .idCode(personal.getIdCode()) .tag("上访人员") + .eventTime(LocalDateTime.now()) .personId(personal.getId()) .sourceData("发现该人员有过上访经历，增加风险分5分") .build();