From 9c80d9a25eedb1e4454d1ebdd26cb6403be4ce0e Mon Sep 17 00:00:00 2001 From: sjh Date: Fri, 13 Dec 2024 15:47:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=A4=A7=E9=83=A8=E5=88=86=E7=94=A8fo?= =?UTF-8?q?r=E5=BE=AA=E7=8E=AF=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/ApplicationEvent.java | 80 +++++----- .../mapper/dwd/GBaseCSCZRKMapper.java | 23 +++ .../mapper/dwd/GBaseGAXZCFJDSMapper.java | 3 +- .../mapper/dwd/GBaseJJDMapper.java | 7 + .../mapper/dwd/GBaseWFRWFXXMapper.java | 7 + .../mapper/wdpc2/WdpcGrjdJsbryMapper.java | 3 + .../mapper/wdpc2/WdpcJZJLBMapper.java | 8 +- .../mapper/wdpc2/WdpcSqjzryMapper.java | 3 + .../mapper/wdpc2/WdpcXdryMapper.java | 4 + .../mapper/wdpc2/WdpcXfsjCsDetailMapper.java | 20 +++ .../mapper/wdpc2/WdpcXmsfryMapper.java | 3 + .../mapper/wdpc2/WdpcYbxxMapper.java | 2 +- .../service/impl/PersonalServiceImpl.java | 2 +- .../service/impl/PointServiceImpl.java | 138 ++++++------------ .../biutag/supervisiondata/util/TxtUtil.java | 23 ++- 15 files changed, 175 insertions(+), 151 deletions(-) diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index 1557f89..542a2f2 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -103,50 +103,50 @@ public class ApplicationEvent { LocalDateTime end = LocalDateTime.now(); CompletableFutureUtil.runSync(() -> { personalService.init(); - personalService.pullInvestigate(); - personalService.pullPsychosis(); - gBaseSHRWFRService.pullAndSave(start, end); - petitionService.personPullAndSave(start, end); - personalService.pullPetitionAgain(); - pointService.personPullAndSave(start, end); - gBaseJJDService.pullAndSave(start, end); - riskPersonalService.fixed(); - personalService.syncPerson(); - - petitionService.petitionModelTask(initDomain(List.of(40))); - riskTaskService.eduAndAreaModelTask(initDomain(List.of(34,41))); +// personalService.pullInvestigate(); +// personalService.pullPsychosis(); +// gBaseSHRWFRService.pullAndSave(start, end); +// petitionService.personPullAndSave(start, end); +// personalService.pullPetitionAgain(); +// pointService.personPullAndSave(start, end); +// gBaseJJDService.pullAndSave(start, end); +// riskPersonalService.fixed(); +// personalService.syncPerson(); + +// petitionService.petitionModelTask(initDomain(List.of(40))); +// riskTaskService.eduAndAreaModelTask(initDomain(List.of(34,41))); // 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.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(40))); +// 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(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.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))); @@ -155,7 +155,7 @@ public class ApplicationEvent { pointService.syncXIDU(initDomain(List.of(122))); pointService.syncFiliation(initDomain(List.of(123))); // 必须在123后面 - gBaseJJDService.syncOtherContradict(initDomain(List.of(75))); +// gBaseJJDService.syncOtherContradict(initDomain(List.of(75))); pointService.syncPetitionContent(initDomain(List.of(124))); pointService.syncMedicalPressure(initDomain(List.of(125))); 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 b4557fb..4cfa7ad 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseCSCZRKMapper.java @@ -25,6 +25,10 @@ public interface GBaseCSCZRKMapper extends BaseMapper { + "") List selectDomicileType(List idNos); + // 户籍类型 + @Select("SELECT a.gmsfhm, a.hlxmc FROM dwd_ry_kxgxzyk_csczrk a inner join csga_wdpcdb.wdpc_person b on a.gmsfhm = b.id_code WHERE a.hlxmc is not null") + List selectDomicileType(); + // 父母婚姻变故 @Select("") List selectParentsDivorce(List idNos); + // 父母婚姻变故 + @Select("select distinct a.gmsfhm from (SELECT DISTINCT a.gmsfhm FROM csga_dwd.dwd_ry_kxgxzyk_csczrk a join csga_wdpcdb.wdpc_grjd_lhxx b " + + "on (a.fqgmsfzhm = b.male_id_code or a.mqgmsfzhm = b.female_id_code)) a inner join csga_wdpcdb.wdpc_person b on a.gmsfhm = b.id_code;") + List selectParentsDivorce(); + // 亲近家人死亡 @Select("") List selectChildNo(List idNos); + // 行为人子女数 + @Select("SELECT c.gmsfhm, SUM(CASE WHEN c.mc1 = '子' AND c.mc2 IN ('孙子','孙女') THEN 1 " + + "WHEN c.mc1 = '女' AND c.mc2 IN ('外孙子','外孙女') THEN 1 " + + "WHEN c.mc1 IN ('户主','本人','妻','夫','配偶') AND c.mc2 IN ('子','女','独生子','独生女','长子','次子','三子','四子','五子','二女','三女','四女','五女') THEN 1 " + + "WHEN c.mc1 IN ('父亲','母亲') AND c.mc2 IN ('户主','本人','兄','弟','姐姐','妹妹') THEN 1 " + + "WHEN c.mc1 IN ('兄','弟') AND c.mc2 IN ('侄女','侄子') THEN 1 " + + "WHEN c.mc1 IN ('姐姐','妹妹') AND c.mc2 IN ('外甥女','外甥') THEN 1 " + + "WHEN c.mc1 IN ('独生女','长女','二女','儿媳') AND c.mc2 IN ('外孙子','外孙女') THEN 1 " + + "WHEN c.mc1 IN ('独生子','长子','次子','女婿') AND c.mc2 IN ('孙子','孙女') THEN 1 " + + "ELSE 0 END) AS score from " + + "(SELECT a.gmsfhm, a.yhzgxmc mc1, b.yhzgxmc mc2 FROM dwd_ry_kxgxzyk_csczrk a JOIN dwd_ry_kxgxzyk_csczrk b ON a.hh = b.hh " + + "inner join csga_wdpcdb.wdpc_person d on a.gmsfhm = d.id_code WHERE a.gmsfhm != b.gmsfhm) c GROUP BY c.gmsfhm") + List selectChildNo(); + // 家人患严重疾病 @Select("") List selectByIdNos(List idNos); + + @Select("select a.id_code, a.actual_time, a.actual_id from wdpc_grjd_jsbry a inner join negative.risk_personal b on a.id_code = b.id_code;") + List selectByIdNos(); } diff --git a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcJZJLBMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcJZJLBMapper.java index 0c97589..703d362 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcJZJLBMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcJZJLBMapper.java @@ -12,11 +12,17 @@ import java.util.List; * @since 1.8 */ public interface WdpcJZJLBMapper extends BaseMapper { + @Select("select a.id_code, a.disease_name from wdpc_grjd_jzjlb a inner join negative.risk_personal b on a.id_code = b.id_code " + + "where (a.disease_name like '%恶性肿瘤%' or a.disease_name like '%移植%' or a.disease_name like '%帕金森%' " + + "or a.disease_name like '%精神病%' or a.disease_name like '%严重%' or a.disease_name like '%脑中风%' " + + "or a.disease_name like '%急性心肌梗塞%' or (a.disease_name like '%脑损伤%' and '%重%'))") + List selectSeriousIllness(); + @Select("select id_code, disease_name from wdpc_grjd_jzjlb " + "where (disease_name like '%恶性肿瘤%' or disease_name like '%移植%' or disease_name like '%帕金森%' " + "or disease_name like '%精神病%' or disease_name like '%严重%' or disease_name like '%脑中风%' " + "or disease_name like '%急性心肌梗塞%' or (disease_name like '%脑损伤%' and '%重%'))") - List selectSeriousIllness(); + List selectFamilySeriousIllness(); @Select("select id_code from wdpc_grjd_jzjlb " + "where disease_name like '%艾滋%'") diff --git a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcSqjzryMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcSqjzryMapper.java index d53ed68..ca97dfa 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcSqjzryMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcSqjzryMapper.java @@ -19,4 +19,7 @@ public interface WdpcSqjzryMapper extends BaseMapper { + "" + "") List selectByIdNos(List idNos); + + @Select("select a.id_code, a.sentence_organization_name, a.correct_end_time, a.correct_begin_time, a.action_place, a.crime_describe from wdpc_grjd_sqjzry a inner join negative.risk_personal b on a.id_code = b.id_code;") + List selectByIdNos(); } diff --git a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXdryMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXdryMapper.java index a5c5e28..b831031 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXdryMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXdryMapper.java @@ -20,4 +20,8 @@ public interface WdpcXdryMapper extends BaseMapper { + "" + "") List selectXIDU(List idCard); + + @Select("select a.sfzh, a.xm, a.fxdw_dwmc, a.fxjsrq, a.fxqsrq, a.chdw_dwmc, a.gkxz_mc, a.jlsmc, a.rsrq, a.csrq from wdpc_grjd_xdry a " + + "inner join negative.risk_personal b on a.sfzh = b.id_code where (a.swrq is not null or a.swyy is not null);") + List selectXIDU(); } diff --git a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXfsjCsDetailMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXfsjCsDetailMapper.java index 555de97..293c7e6 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXfsjCsDetailMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXfsjCsDetailMapper.java @@ -24,6 +24,11 @@ public interface WdpcXfsjCsDetailMapper extends BaseMapper { + "") List selectPetitionContent5(List idNos); + @Select("select a.id_code, count(a.id_code) count_num, a.detail from wdpc_grjd_xfsj_cs_detail a inner join negative.risk_personal b on a.id_code = b.id_code " + + "where (a.detail like '%退%' or a.detail like '%迁%' or a.detail like '%军%') " + + "and (a.detail not like '%投诉%' and a.detail not like '%举报%' and a.detail not like '%不公%' and a.detail not like '%交房%');") + List selectPetitionContent5(); + @Select("") List selectPetitionContent3(List idNos); + @Select("select a.id_code, count(a.id_code) count_num, a.detail from wdpc_grjd_xfsj_cs_detail a inner join negative.risk_personal b on a.id_code = b.id_code " + + "where (a.detail like '%投诉%' or a.detail like '%举报%') " + + "and (a.detail not like '%退%' and a.detail not like '%迁%' and a.detail not like '%军%' and a.detail not like '%不公%' and a.detail not like '%交房%');") + List selectPetitionContent3(); + @Select("") List selectPetitionContent2(List idNos); + @Select("select a.id_code, count(a.id_code) count_num, a.detail from wdpc_grjd_xfsj_cs_detail a inner join negative.risk_personal b on a.id_code = b.id_code " + + "where (a.detail like '%不公%' or a.detail like '%交房%') " + + "and (a.detail not like '%退%' and a.detail not like '%迁%' and a.detail not like '%军%' and a.detail not like '%投诉%' and a.detail not like '%举报%');") + List selectPetitionContent2(); + @Select("") List selectPetitionDissatisfied(List idNos); + + @Select("select distinct a.id_code from wdpc_grjd_xfsj_cs_detail a inner join negative.risk_personal b on a.id_code = b.id_code " + + "where a.satisfaction_code = '1' " + + "group by a.id_code") + List selectPetitionDissatisfied(); } diff --git a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXmsfryMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXmsfryMapper.java index 5538149..8d8c76f 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXmsfryMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXmsfryMapper.java @@ -19,4 +19,7 @@ public interface WdpcXmsfryMapper extends BaseMapper { + "" + "") List selectByIdNos(List idNos); + + @Select("select a.id_code, a.crime_name, a.sentence_time, a.prison_begin, a.prison_end, a.prison_organization from wdpc_grjd_xmsfry a inner join negative.risk_personal b on a.id_code = b.id_code;") + List selectByIdNos(); } diff --git a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcYbxxMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcYbxxMapper.java index 7d2f50b..c857273 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcYbxxMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcYbxxMapper.java @@ -12,6 +12,6 @@ import java.util.List; * @since 1.8 */ public interface WdpcYbxxMapper extends BaseMapper { - @Select("select distinct id_code from wdpc_grjd_ybxx") + @Select("select distinct a.id_code from wdpc_grjd_ybxx a inner join negative.risk_personal b on a.id_code = b.id_code;") List selectMedicalPressure(); } 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 a75d169..ddcffd8 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java @@ -484,7 +484,7 @@ public class PersonalServiceImpl implements PersonalService { public void init() { riskTestRepository.getBaseMapper().truncateControl(); riskTestRepository.getBaseMapper().truncateClue(); - riskTestRepository.getBaseMapper().truncatePerson(); +// riskTestRepository.getBaseMapper().truncatePerson(); riskTestRepository.getBaseMapper().truncateTag(); riskTestRepository.getBaseMapper().truncateTask(); riskTestRepository.getBaseMapper().truncateTable(); 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 ad77d84..e052564 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java @@ -338,25 +338,21 @@ public class PointServiceImpl implements PointService { log.info("模型116开始查询"); List list = gAXZCFJDSRepository.getBaseMapper().selectAdministrativePunishment(); log.info("模型116查询结果数：{}", list.size()); + Map> gAXZCFJDSMap = list.stream().collect(Collectors.groupingBy(GBaseGAXZCFJDS::getZjhm)); Map personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal)); List toInsert = new ArrayList<>(); - for (GBaseGAXZCFJDS domicileType : list) { - RiskPersonal personal = personalMap.get(domicileType.getZjhm()); + for (Map.Entry> entry : gAXZCFJDSMap.entrySet()) { + String zjhm = entry.getKey(); + List wfrwfxxList = entry.getValue(); + RiskPersonal personal = personalMap.get(zjhm); if (personal == null) continue; - if (idCode.get(domicileType.getZjhm()) != null) continue; - if (oldMap.get(domicileType.getZjhm()) != null) continue; + if (idCode.get(zjhm) != null) continue; + if (oldMap.get(zjhm) != null) continue; - idCode.put(domicileType.getZjhm(), 1); + idCode.put(zjhm, 1); int score; - if (domicileType.getCountNum() > 5) { - score = 5; - } else { - score = domicileType.getCountNum(); - } - String context = ""; - if (domicileType.getCountNum() > 1) { - context = "其中一件"; - } + String context = wfrwfxxList.stream().map(GBaseGAXZCFJDS::getAjbh).collect(Collectors.joining(",")); + score = Math.min(wfrwfxxList.size(), 5); ClueData data = ClueData.builder() .name(personal.getName()) .id(personal.getId().toString()) @@ -364,11 +360,9 @@ public class PointServiceImpl implements PointService { .tag("受到行政处罚") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员涉及" + domicileType.getCountNum() + "起案件，" + context + "为“" + domicileType.getAjmc() + "”，案件编号：" - + domicileType.getAjbh() + "，处罚内容为“" + domicileType.getCfms1() - + "”。因受到" + domicileType.getCountNum() + "起行政处罚") + .sourceData("发现该人员涉及" + wfrwfxxList.size() + "个行政处罚，案件编号为：“" + context + "”" ) .build(); - toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); + toInsert.add(createClue(task.getModelId(), score, task.getId(), data)); } if (!toInsert.isEmpty()) { modelTaskClueService.saveClues(toInsert, Default.ADMINISTRATIVEPUNISHMENT); @@ -392,27 +386,21 @@ public class PointServiceImpl implements PointService { log.info("模型115开始查询"); List list = wFRWFXXRepository.getBaseMapper().selectCriminalPunishment(); log.info("模型115查询结果数：{}", list.size()); + Map> wfrwfxxMap = list.stream().collect(Collectors.groupingBy(GBaseWFRWFXX::getZjhm)); Map personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal)); List toInsert = new ArrayList<>(); - for (GBaseWFRWFXX domicileType : list) { - RiskPersonal personal = personalMap.get(domicileType.getZjhm()); + for (Map.Entry> entry : wfrwfxxMap.entrySet()) { + String zjhm = entry.getKey(); + List wfrwfxxList = entry.getValue(); + RiskPersonal personal = personalMap.get(zjhm); if (personal == null) continue; - if (idCode.get(domicileType.getZjhm()) != null) continue; - if (oldMap.get(domicileType.getZjhm()) != null) continue; + if (idCode.get(zjhm) != null) continue; + if (oldMap.get(zjhm) != null) continue; - idCode.put(domicileType.getZjhm(), 1); + idCode.put(zjhm, 1); int score; - String context = ""; - if (domicileType.getCountNum() > 5) { - score = 5; - } else { - score = domicileType.getCountNum(); - } - if (domicileType.getCountNum() > 1) { - context = "。除此案件外，该人员还有" + domicileType.getCountNum() + "个刑事处罚"; - } else { - context = "。因受到过1个刑事处罚"; - } + String context = wfrwfxxList.stream().map(GBaseWFRWFXX::getAjbh).collect(Collectors.joining(",")); + score = Math.min(wfrwfxxList.size(), 5); ClueData data = ClueData.builder() .name(personal.getName()) .id(personal.getId().toString()) @@ -420,10 +408,9 @@ public class PointServiceImpl implements PointService { .tag("受到刑事处罚") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员" + domicileType.getJysm() + "案件编号：" + domicileType.getAjbh() - + context ) + .sourceData("发现该人员涉及" + wfrwfxxList.size() + "个刑事案件，案件编号为：“" + context + "”" ) .build(); - toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); + toInsert.add(createClue(task.getModelId(), score, task.getId(), data)); } if (!toInsert.isEmpty()) { modelTaskClueService.saveClues(toInsert, Default.CRIMINALPUNISHMENT); @@ -444,12 +431,8 @@ public class PointServiceImpl implements PointService { Map oldMap = domain.getOldMap(task.getModelId(), true); Map idCode = new HashMap<>(); - List list = new ArrayList<>(); log.info("模型117开始查询"); - for (List idCard : domain.getIdCards()) { - list.addAll(cSCZRKRepository.getBaseMapper().selectParentsDivorce(idCard)); - log.info("模型117查询进度 | {}", list.size()); - } + List list = cSCZRKRepository.getBaseMapper().selectParentsDivorce(); log.info("模型117查询结果数：{}", list.size()); Map personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal)); List toInsert = new ArrayList<>(); @@ -595,7 +578,7 @@ public class PointServiceImpl implements PointService { Map oldMap = domain.getOldMap(task.getModelId(), true); Map idCode = new HashMap<>(); log.info("模型127开始查询"); - List wdpcJZJLBList = jZJLBRepository.getBaseMapper().selectSeriousIllness(); + List wdpcJZJLBList = jZJLBRepository.getBaseMapper().selectFamilySeriousIllness(); // 切割 每次查10000条 List> wdpcJZJLBParts = IntStream.range(0, (wdpcJZJLBList.size() + 9999) / 10000) .mapToObj(i -> wdpcJZJLBList.subList(i * 10000, Math.min((i + 1) * 10000, wdpcJZJLBList.size()))) @@ -690,17 +673,11 @@ public class PointServiceImpl implements PointService { Map oldMap = domain.getOldMap(task.getModelId(), true); Map idCode = new HashMap<>(); log.info("模型129开始查询"); - List list1 = new ArrayList<>(); + List list1 = jsbryRepository.getBaseMapper().selectByIdNos(); List list2 = jZJLBRepository.getBaseMapper().selectForModel129();; - List list3 = new ArrayList<>(); - List list4 = new ArrayList<>(); - List list5 = new ArrayList<>(); - for (List idCard : domain.getIdCards()) { - list1.addAll(jsbryRepository.getBaseMapper().selectByIdNos(idCard)); - list3.addAll(xdryRepository.getBaseMapper().selectXIDU(idCard)); - list4.addAll(sqjzryRepository.getBaseMapper().selectByIdNos(idCard)); - list5.addAll(xmsfryRepository.getBaseMapper().selectByIdNos(idCard)); - } + List list3 = xdryRepository.getBaseMapper().selectXIDU(); + List list4 = sqjzryRepository.getBaseMapper().selectByIdNos(); + List list5 = xmsfryRepository.getBaseMapper().selectByIdNos(); log.info("模型129查询结果数：{},{},{},{},{}", list1.size(), list2.size(), list3.size(), list4.size(), list5.size()); Map personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal)); List toInsert = new ArrayList<>(); @@ -819,17 +796,11 @@ public class PointServiceImpl implements PointService { Map oldMap = domain.getOldMap(task.getModelId(), true); Map idCode = new HashMap<>(); log.info("模型130开始查询"); - List list1 = new ArrayList<>(); + List list1 = jsbryRepository.getBaseMapper().selectByIdNos(); List list2 = jZJLBRepository.getBaseMapper().selectForModel129();; - List list3 = new ArrayList<>(); - List list4 = new ArrayList<>(); - List list5 = new ArrayList<>(); - for (List idCard : domain.getIdCards()) { - list1.addAll(jsbryRepository.getBaseMapper().selectByIdNos(idCard)); - list3.addAll(xdryRepository.getBaseMapper().selectXIDU(idCard)); - list4.addAll(sqjzryRepository.getBaseMapper().selectByIdNos(idCard)); - list5.addAll(xmsfryRepository.getBaseMapper().selectByIdNos(idCard)); - } + List list3 = xdryRepository.getBaseMapper().selectXIDU(); + List list4 = sqjzryRepository.getBaseMapper().selectByIdNos(); + List list5 = xmsfryRepository.getBaseMapper().selectByIdNos(); log.info("模型130查询结果数：{},{},{},{},{}", list1.size(), list2.size(), list3.size(), list4.size(), list5.size()); Map personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal)); List toInsert = new ArrayList<>(); @@ -1081,11 +1052,8 @@ public class PointServiceImpl implements PointService { Map oldMap = domain.getOldMap(task.getModelId(), true); Map idCode = new HashMap<>(); - List list = new ArrayList<>(); log.info("模型122开始查询"); - for (List idCard : domain.getIdCards()) { - list.addAll(xdryRepository.getBaseMapper().selectXIDU(idCard)); - } + List list = xdryRepository.getBaseMapper().selectXIDU(); log.info("模型122查询结果数：{}", list.size()); Map personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal)); List toInsert = new ArrayList<>(); @@ -1188,15 +1156,10 @@ public class PointServiceImpl implements PointService { Map oldMap = domain.getOldMap(task.getModelId(), true); Map idCode = new HashMap<>(); - List list5 = new ArrayList<>(); - List list3 = new ArrayList<>(); - List list2 = new ArrayList<>(); log.info("模型124开始查询"); - for (List idCard : domain.getIdCards()) { - list5.addAll(xfsjCsDetailRepository.getBaseMapper().selectPetitionContent5(idCard)); - list3.addAll(xfsjCsDetailRepository.getBaseMapper().selectPetitionContent3(idCard)); - list2.addAll(xfsjCsDetailRepository.getBaseMapper().selectPetitionContent2(idCard)); - } + List list5 = xfsjCsDetailRepository.getBaseMapper().selectPetitionContent5(); + List list3 = xfsjCsDetailRepository.getBaseMapper().selectPetitionContent3(); + List list2 = xfsjCsDetailRepository.getBaseMapper().selectPetitionContent2(); log.info("模型124查询结果数：{}、{}、{}", list5.size(), list3.size(), list2.size()); Map personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal)); List toInsert = new ArrayList<>(); @@ -1279,11 +1242,8 @@ public class PointServiceImpl implements PointService { Map oldMap = domain.getOldMap(task.getModelId(), true); Map idCode = new HashMap<>(); - List list = new ArrayList<>(); log.info("模型123开始查询"); - for (List idCard : domain.getIdCards()) { - list.addAll(jjdRepository.getBaseMapper().selectFiliation(idCard)); - } + List list = jjdRepository.getBaseMapper().selectFiliation(); log.info("模型123查询结果数：{}", list.size()); Map personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal)); List toInsert = new ArrayList<>(); @@ -1332,11 +1292,8 @@ public class PointServiceImpl implements PointService { 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)); - } + List list = cSCZRKRepository.getBaseMapper().selectChildNo(); log.info("模型121查询结果数：{}", list.size()); Map personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal)); List toInsert = new ArrayList<>(); @@ -1440,11 +1397,8 @@ public class PointServiceImpl implements PointService { Map oldMap = domain.getOldMap(task.getModelId(), true); Map idCode = new HashMap<>(); - List list = new ArrayList<>(); log.info("模型114开始查询"); - for (List idCard : domain.getIdCards()) { - list.addAll(cSCZRKRepository.getBaseMapper().selectDomicileType(idCard)); - } + List list = cSCZRKRepository.getBaseMapper().selectDomicileType(); log.info("模型114查询结果数：{}", list.size()); Map personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal)); List toInsert = new ArrayList<>(); @@ -1594,10 +1548,7 @@ public class PointServiceImpl implements PointService { Map oldMap = domain.getOldMap(task.getModelId(), true); Map idCode = new HashMap<>(); - List list = new ArrayList<>(); - for (List idCard : domain.getIdCards()) { - list.addAll(xfsjCsDetailRepository.getBaseMapper().selectPetitionDissatisfied(idCard)); - } + List list = xfsjCsDetailRepository.getBaseMapper().selectPetitionDissatisfied(); log.info("模型128查询总结果数：{}", list.size()); Map personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal)); List toInsert = new ArrayList<>(); @@ -1639,9 +1590,9 @@ public class PointServiceImpl implements PointService { Map oldMap = domain.getOldMap(task.getModelId(), true); Map idCode = new HashMap<>(); List list = wdpcGrjdXfsjRepository.getBaseMapper().selectXfMan(); - log.info("模型111第一次查询结果数：{}", list.size()); + log.info("模型111(40)第一次查询结果数：{}", list.size()); list.addAll(wdpcGrjdXfsjCsRepository.getBaseMapper().selectXfMan()); - log.info("模型111第二次查询后总结果数：{}", list.size()); + log.info("模型111(40)第二次查询后总结果数：{}", list.size()); Map personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal)); List toInsert = new ArrayList<>(); for (WdpcGrjdXfsj xfMan : list) { @@ -2302,6 +2253,7 @@ public class PointServiceImpl implements PointService { SimpleDateFormat sdf = new SimpleDateFormat("yyyy年M月d日"); return sdf.format(date); } catch (Exception e) { + log.error("时间转换失败:{}", date, e); } } return " 无时间数据 "; diff --git a/src/main/java/com/biutag/supervisiondata/util/TxtUtil.java b/src/main/java/com/biutag/supervisiondata/util/TxtUtil.java index 7baabd1..73ac5d9 100644 --- a/src/main/java/com/biutag/supervisiondata/util/TxtUtil.java +++ b/src/main/java/com/biutag/supervisiondata/util/TxtUtil.java @@ -1,15 +1,13 @@ package com.biutag.supervisiondata.util; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONArray; import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; import java.io.BufferedWriter; import java.io.FileWriter; import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Paths; +import java.text.SimpleDateFormat; +import java.util.Date; /** * @author kami on 2024-07-15 15:47:40 @@ -29,15 +27,14 @@ public class TxtUtil { } public static void main(String[] args) { - String content = ""; - try { - content = new String(Files.readAllBytes(Paths.get("D:\\work\\code\\gitlab\\health-web\\src\\assets\\a.json"))); - } catch (IOException e) { - e.printStackTrace(); - } - JSONArray array = JSON.parseArray(content); - for (int i = 0; i < array.size(); i++) { - log.info("{}", array.getJSONObject(i).getString("id")); + Date date = new Date(); + if (date != null) { + try { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy年M月d日"); + System.out.println(sdf.format(date)); + } catch (Exception e) { + } } + System.out.println(" 无时间数据 "); } }