From b176c3d7629839d3122b7b458f2074eed04d9844 Mon Sep 17 00:00:00 2001 From: sjh Date: Fri, 20 Dec 2024 09:49:53 +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=E6=A8=A1=E5=9E=8B=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=A1=88=E4=BB=B6=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/ApplicationEvent.java | 4 ++-- .../mapper/dwd/GBaseWFRXXMapper.java | 12 ++++++------ .../pojo/entity/dwd/GBaseWFRXX.java | 3 +++ .../service/impl/PointServiceImpl.java | 18 ++++++++++++------ 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index a927b44..bf17d1a 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -29,8 +29,8 @@ import java.util.stream.Collectors; * @version 0.0.1 * @since 1.8 */ -@Slf4j @Component +@Slf4j public class ApplicationEvent { @Resource @@ -132,7 +132,7 @@ public class ApplicationEvent { // jsbryService.syncPys(initDomain(List.of(59))); // gBaseSHRWFRService.combatCrime(initDomain(List.of(63))); // gBaseJJDService.warningInstance(initDomain(List.of(64))); -// gBaseJJDService.syncHomeViolence(initDomain(List.of(65,66))); + 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))); diff --git a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRXXMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRXXMapper.java index 0d7f34a..15f7aef 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRXXMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRXXMapper.java @@ -58,17 +58,17 @@ public interface GBaseWFRXXMapper extends BaseMapper { " on a.zjhm = b.id_code where a.zydm is not null ") List selectWork(); - @Select("select b.ajbh, b.zjhm " + + @Select("select b.ajbh, b.zjhm, a.ajmc " + "from dwd_asj_zfba_ajjbxx a " + "join dwd_ry_zfba_wfryxx b on a.ajbh = b.ajbh " + "inner join csga_wdpcdb.wdpc_person c on b.zjhm = c.id_code " + - "where a.ajbzdm = 1;") - List selectCriminalPunishment(); + "where a.ajbzdm = 1 and b.lrsj between #{startTime} and #{endTime};") + List selectCriminalPunishment(@Param("startTime")String startTime, @Param("endTime")String endTime); - @Select("select b.ajbh, b.zjhm " + + @Select("select b.ajbh, b.zjhm, a.ajmc " + "from dwd_asj_zfba_ajjbxx a " + "join dwd_ry_zfba_wfryxx b on a.ajbh = b.ajbh " + "inner join csga_wdpcdb.wdpc_person c on b.zjhm = c.id_code " + - "where a.ajbzdm = 2;") - List selectAdministrativePunishment(); + "where a.ajbzdm = 2 and b.lrsj between #{startTime} and #{endTime};") + List selectAdministrativePunishment(@Param("startTime")String startTime, @Param("endTime")String endTime); } diff --git a/src/main/java/com/biutag/supervisiondata/pojo/entity/dwd/GBaseWFRXX.java b/src/main/java/com/biutag/supervisiondata/pojo/entity/dwd/GBaseWFRXX.java index 28bef26..e6e273b 100644 --- a/src/main/java/com/biutag/supervisiondata/pojo/entity/dwd/GBaseWFRXX.java +++ b/src/main/java/com/biutag/supervisiondata/pojo/entity/dwd/GBaseWFRXX.java @@ -63,4 +63,7 @@ public class GBaseWFRXX implements Serializable { @TableField("lrsj") Date lrsj; + + @TableField(exist = false, value = "ajmc") + String ajmc; } 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 ea8cf80..48b987b 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java @@ -328,7 +328,9 @@ public class PointServiceImpl implements PointService { Map oldMap = domain.getOldMap(task.getModelId(), true); Map idCode = new HashMap<>(); log.info("模型116开始查询"); - List list = wFRXXRepository.getBaseMapper().selectAdministrativePunishment(); + LocalDateTime start = LocalDateTime.of(2019, 12, 6, 0, 0, 0); + LocalDateTime end = LocalDate.now().atTime(0, 0, 0); + List list = wFRXXRepository.getBaseMapper().selectAdministrativePunishment(start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), end.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); log.info("模型116查询结果数：{}", list.size()); Map> gAXZCFJDSMap = list.stream().collect(Collectors.groupingBy(GBaseWFRXX::getZjhm)); Map personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal)); @@ -346,7 +348,8 @@ public class PointServiceImpl implements PointService { // 去重 wfrwfxxList = wfrwfxxList.stream().filter(StreamUtil.distinctByKey(GBaseWFRXX::getAjbh)).toList(); - String context = wfrwfxxList.stream().map(GBaseWFRXX::getAjbh).collect(Collectors.joining(",")); + String context = "，案件编号为：“" + wfrwfxxList.stream().map(GBaseWFRXX::getAjbh).collect(Collectors.joining("、")) + "”"; + context = context + "，案件名称分别为：“" + wfrwfxxList.stream().map(GBaseWFRXX::getAjmc).collect(Collectors.joining("、")) + "”。"; score = Math.min(wfrwfxxList.size(), 5); ClueData data = ClueData.builder() .name(personal.getName()) @@ -356,7 +359,7 @@ public class PointServiceImpl implements PointService { .score(score) .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员涉及" + wfrwfxxList.size() + "个行政处罚，案件编号为：“" + context + "”") + .sourceData("发现该人员涉及" + wfrwfxxList.size() + "个行政处罚" + context) .build(); toInsert.add(DataUtil.createClueData(task, data)); } @@ -373,7 +376,9 @@ public class PointServiceImpl implements PointService { Map oldMap = domain.getOldMap(task.getModelId(), true); Map idCode = new HashMap<>(); log.info("模型115开始查询"); - List list = wFRXXRepository.getBaseMapper().selectCriminalPunishment(); + LocalDateTime start = LocalDateTime.of(2019, 12, 6, 0, 0, 0); + LocalDateTime end = LocalDate.now().atTime(0, 0, 0); + List list = wFRXXRepository.getBaseMapper().selectCriminalPunishment(start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), end.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); log.info("模型115查询结果数：{}", list.size()); Map> wfrxxMap = list.stream().collect(Collectors.groupingBy(GBaseWFRXX::getZjhm)); Map personalMap = domain.getPersons().stream().collect(Collectors.toMap(RiskPersonal::getIdCode, Function.identity(), (old, newVal) -> newVal)); @@ -391,7 +396,8 @@ public class PointServiceImpl implements PointService { // 去重 wfrxxList = wfrxxList.stream().filter(StreamUtil.distinctByKey(GBaseWFRXX::getAjbh)).toList(); - String context = wfrxxList.stream().map(GBaseWFRXX::getAjbh).collect(Collectors.joining(",")); + String context = "，案件编号为：“" + wfrxxList.stream().map(GBaseWFRXX::getAjbh).collect(Collectors.joining("、")) + "”"; + context = context + "，案件名称分别为：“" + wfrxxList.stream().map(GBaseWFRXX::getAjmc).collect(Collectors.joining("、")) + "”。"; score = Math.min(wfrxxList.size(), 5); ClueData data = ClueData.builder() .name(personal.getName()) @@ -401,7 +407,7 @@ public class PointServiceImpl implements PointService { .score(score) .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员涉及" + wfrxxList.size() + "个刑事案件，案件编号为：“" + context + "”") + .sourceData("发现该人员涉及" + wfrxxList.size() + "个刑事案件" + context) .build(); toInsert.add(DataUtil.createClueData(task, data)); }