From 99b64cabeae9e8731016bbe73dd0eae7fe7763ef Mon Sep 17 00:00:00 2001 From: sjh Date: Tue, 10 Dec 2024 16:08:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=97=E5=88=B0=E5=88=91?= =?UTF-8?q?=E4=BA=8B=E5=A4=84=E7=BD=9A=E3=80=81=E5=8F=97=E5=88=B0=E8=A1=8C?= =?UTF-8?q?=E6=94=BF=E5=A4=84=E7=BD=9A=E7=9A=84=E7=A7=AF=E5=88=86=E8=A7=84?= =?UTF-8?q?=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/ApplicationEvent.java | 4 ++-- .../mapper/dwd/GBaseGAXZCFJDSMapper.java | 3 ++- .../mapper/dwd/GBaseWFRWFXXMapper.java | 9 +++++-- .../pojo/entity/dwd/GBaseGAXZCFJDS.java | 3 +++ .../pojo/entity/dwd/GBaseWFRWFXX.java | 4 ++++ .../service/impl/PointServiceImpl.java | 24 ++++++++++++++++--- 6 files changed, 39 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 858581a..df7d38f 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -152,8 +152,8 @@ 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.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))); diff --git a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseGAXZCFJDSMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseGAXZCFJDSMapper.java index 832953c..2201241 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseGAXZCFJDSMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseGAXZCFJDSMapper.java @@ -12,6 +12,7 @@ import java.util.List; * @since 1.8 */ public interface GBaseGAXZCFJDSMapper extends BaseMapper { - @Select("select ajbh, ajmc, zjhm, cfms1 from dwd_wp_zfba_gaxzcfjds;") + @Select("select ajbh, ajmc, zjhm, cfms1, " + + "(SELECT COUNT(DISTINCT ajbh) FROM dwd_wp_zfba_gaxzcfjds AS sub WHERE sub.zjhm = main.zjhm) count_num from dwd_wp_zfba_gaxzcfjds main;") List selectAdministrativePunishment(); } 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 4b3c309..073338e 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,12 @@ import java.util.List; * @since 1.8 */ public interface GBaseWFRWFXXMapper extends BaseMapper { - @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;") + @Select("select a.ajbh, b.zjhm, b.ajmc, b.jysm, b.djrq, " + + "(SELECT COUNT(DISTINCT a2.ajbh) FROM dwd_asj_zfba_ajjbxx a2 " + + "JOIN dwd_asj_zfba_wfrwfxx b2 ON a2.ajbh = b2.ajbh " + + "WHERE a2.zjhm = a.zjhm AND a2.ajbzdm = 1) count_num " + + "from dwd_asj_zfba_ajjbxx a " + + "join dwd_asj_zfba_wfrwfxx b on a.ajbh = b.ajbh " + + "where a.ajbzdm = 1;") List selectCriminalPunishment(); } diff --git a/src/main/java/com/biutag/supervisiondata/pojo/entity/dwd/GBaseGAXZCFJDS.java b/src/main/java/com/biutag/supervisiondata/pojo/entity/dwd/GBaseGAXZCFJDS.java index a70d0b4..af6dce3 100644 --- a/src/main/java/com/biutag/supervisiondata/pojo/entity/dwd/GBaseGAXZCFJDS.java +++ b/src/main/java/com/biutag/supervisiondata/pojo/entity/dwd/GBaseGAXZCFJDS.java @@ -40,4 +40,7 @@ public class GBaseGAXZCFJDS implements Serializable { @TableField("cfms1") String cfms1; + // 数量 + @TableField("count_num") + Integer countNum; } diff --git a/src/main/java/com/biutag/supervisiondata/pojo/entity/dwd/GBaseWFRWFXX.java b/src/main/java/com/biutag/supervisiondata/pojo/entity/dwd/GBaseWFRWFXX.java index b101ed6..bde9c41 100644 --- a/src/main/java/com/biutag/supervisiondata/pojo/entity/dwd/GBaseWFRWFXX.java +++ b/src/main/java/com/biutag/supervisiondata/pojo/entity/dwd/GBaseWFRWFXX.java @@ -46,4 +46,8 @@ public class GBaseWFRWFXX implements Serializable { @TableField("djrq") Date djrq; + // 数量 + @TableField("count_num") + Integer countNum; + } 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 9254856..e212e25 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java @@ -328,6 +328,12 @@ public class PointServiceImpl implements PointService { if (oldMap.get(domicileType.getZjhm()) != null) continue; idCode.put(domicileType.getZjhm(), 1); + int score; + if (domicileType.getCountNum() > 5) { + score = 5; + } else { + score = domicileType.getCountNum(); + } ClueData data = ClueData.builder() .name(personal.getName()) .id(personal.getId().toString()) @@ -335,9 +341,9 @@ public class PointServiceImpl implements PointService { .tag("受到行政处罚") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员涉及案件“" + domicileType.getAjmc() + "”，案件编号：" + .sourceData("发现该人员涉及" + domicileType.getCountNum() + "起案件，其中一件为“" + domicileType.getAjmc() + "”，案件编号：" + domicileType.getAjbh() + "，处罚内容为“" + domicileType.getCfms1() - + "”。因受到行政处罚，增加风险分5分") + + "”。因受到" + domicileType.getCountNum() + "起行政处罚，增加风险分" + score + "分") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -372,6 +378,18 @@ public class PointServiceImpl implements PointService { if (oldMap.get(domicileType.getZjhm()) != null) continue; idCode.put(domicileType.getZjhm(), 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个刑事处罚"; + } ClueData data = ClueData.builder() .name(personal.getName()) .id(personal.getId().toString()) @@ -380,7 +398,7 @@ public class PointServiceImpl implements PointService { .eventTime(LocalDateTime.now()) .personId(personal.getId()) .sourceData("发现该人员" + domicileType.getJysm() + "案件编号：" + domicileType.getAjbh() - + "，因受到刑事处罚，增加风险分5分") + + context + "，增加风险分" + score + "分") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); }