From 85c1aa92da775f83fb7c8f601f0bfcd49bc2f3d6 Mon Sep 17 00:00:00 2001 From: sjh Date: Mon, 9 Dec 2024 14:40:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=B8=E9=A3=9F=E6=AF=92=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/ApplicationEvent.java | 2 +- .../mapper/wdpc2/WdpcXdryMapper.java | 23 ++++++++ .../pojo/entity/wdpc2/WdpcXdry.java | 51 ++++++++++++++++ .../repository/WdpcXdryRepository.java | 15 +++++ .../service/impl/PointServiceImpl.java | 59 +++++++++++++++---- 5 files changed, 139 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXdryMapper.java create mode 100644 src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc2/WdpcXdry.java create mode 100644 src/main/java/com/biutag/supervisiondata/repository/WdpcXdryRepository.java diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index 278f15d..9a192bc 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -151,7 +151,7 @@ public class ApplicationEvent { 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.syncXIDU(initDomain(List.of(122))); // *********暂时不要********** // riskTaskService.caseModelTask(initDomain(List.of(35))); diff --git a/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXdryMapper.java b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXdryMapper.java new file mode 100644 index 0000000..a5c5e28 --- /dev/null +++ b/src/main/java/com/biutag/supervisiondata/mapper/wdpc2/WdpcXdryMapper.java @@ -0,0 +1,23 @@ +package com.biutag.supervisiondata.mapper.wdpc2; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.biutag.supervisiondata.pojo.entity.wdpc2.WdpcXdry; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @author kami on 2024-12-06 10:23:13 + * @version 0.0.1 + * @since 1.8 + */ +public interface WdpcXdryMapper extends BaseMapper { + @Select("") + List selectXIDU(List idCard); +} diff --git a/src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc2/WdpcXdry.java b/src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc2/WdpcXdry.java new file mode 100644 index 0000000..1f59219 --- /dev/null +++ b/src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc2/WdpcXdry.java @@ -0,0 +1,51 @@ +package com.biutag.supervisiondata.pojo.entity.wdpc2; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("`wdpc_grjd_xdry`") +public class WdpcXdry implements Serializable { + // 身份证 + @TableField("sfzh") + String sfzh; + + // 姓名 + @TableField("xm") + String xm; + + // 服刑单位 + @TableField("fxdw_dwmc") + String fxdwDwmc; + + // 服刑结束日期 + @TableField("fxjsrq") + String fxjsrq; + + // 服刑起止日期 + @TableField("fxqsrq") + String fxqsrq; + + // 查获单位 + @TableField("chdw_dwmc") + String chdwDwmc; + + // 管控现状 + @TableField("gkxz_mc") + String gkxzMc; + + // 拘留所名称 + @TableField("jlsmc") + String jlsmc; + + // 入所日期 + @TableField("rsrq") + String rsrq; + + // 出所日期 + @TableField("csrq") + String csrq; +} diff --git a/src/main/java/com/biutag/supervisiondata/repository/WdpcXdryRepository.java b/src/main/java/com/biutag/supervisiondata/repository/WdpcXdryRepository.java new file mode 100644 index 0000000..f59993e --- /dev/null +++ b/src/main/java/com/biutag/supervisiondata/repository/WdpcXdryRepository.java @@ -0,0 +1,15 @@ +package com.biutag.supervisiondata.repository; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.biutag.supervisiondata.mapper.wdpc2.WdpcXdryMapper; +import com.biutag.supervisiondata.pojo.entity.wdpc2.WdpcXdry; +import org.springframework.stereotype.Service; + +/** + * @author kami on 2024-12-04 16:18:26 + * @version 0.0.1 + * @since 1.8 + */ +@Service +public class WdpcXdryRepository extends ServiceImpl { +} 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 5bd4255..a3d64da 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java @@ -16,6 +16,7 @@ import com.biutag.supervisiondata.pojo.entity.mine.*; import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcGrjdXfsj; import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcGrjdZblx; import com.biutag.supervisiondata.pojo.entity.wdpc2.WdpcHZCRYXX; +import com.biutag.supervisiondata.pojo.entity.wdpc2.WdpcXdry; import com.biutag.supervisiondata.repository.*; import com.biutag.supervisiondata.service.PointService; import com.biutag.supervisiondata.service.RiskModelTaskClueService; @@ -69,6 +70,8 @@ public class PointServiceImpl implements PointService { private final WdpcHZCRYXXRepository hZCRYXXRepository; + private final WdpcXdryRepository xdryRepository; + @Override public void personPullAndSave(LocalDateTime start, LocalDateTime end) { riskPersonalService.formatAndSave(getPersons(), Default.POINT_POEPLE); @@ -528,27 +531,48 @@ public class PointServiceImpl implements PointService { @Override public void syncXIDU(TaskParamDomain domain) { - /* RiskTask task = createTask(domain.getPersons().size(), 122); taskRepository.save(task); Map oldMap = domain.getOldMap(task.getModelId(), true); Map idCode = new HashMap<>(); - List list = new ArrayList<>(); + List list = new ArrayList<>(); log.info("模型122开始查询"); for (List idCard : domain.getIdCards()) { - list.addAll(cSCZRKRepository.getBaseMapper().selectChildNo(idCard)); + list.addAll(xdryRepository.getBaseMapper().selectXIDU(idCard)); } log.info("模型122查询结果数：{}", 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()); + for (WdpcXdry domicileType : list) { + RiskPersonal personal = personalMap.get(domicileType.getSfzh()); if (personal == null) continue; - if (idCode.get(domicileType.getGmsfhm()) != null) continue; - if (oldMap.get(domicileType.getGmsfhm()) != null) continue; + if (idCode.get(domicileType.getSfzh()) != null) continue; + if (oldMap.get(domicileType.getSfzh()) != null) continue; - idCode.put(domicileType.getGmsfhm(), 1); + idCode.put(domicileType.getSfzh(), 1); + String dataString = ""; + if (domicileType.getFxdwDwmc() != null) { + dataString = dataString + "，且在" + domicileType.getFxdwDwmc() + "服刑"; + } + if (domicileType.getFxqsrq() != null) { + dataString = dataString + "，服刑起始日期为" + getDateString(domicileType.getFxqsrq()); + } + if (domicileType.getFxjsrq() != null) { + dataString = dataString + "，服刑结束日期为" + getDateString(domicileType.getFxjsrq()); + } + if (domicileType.getChdwDwmc() != null) { + dataString = dataString + "，查获单位为" + domicileType.getChdwDwmc(); + } + if (domicileType.getGkxzMc() != null) { + dataString = dataString + "，管控现状为" + domicileType.getGkxzMc(); + } + if (domicileType.getJlsmc() != null && (domicileType.getRsrq() != null)) { + dataString = dataString + "，于" + getDateString(domicileType.getRsrq()) + "进入" + domicileType.getJlsmc(); + if (domicileType.getCsrq() != null) { + dataString = dataString + "，" + getDateString(domicileType.getRsrq()) + "出所"; + } + } ClueData data = ClueData.builder() .name(personal.getName()) .id(personal.getId().toString()) @@ -556,7 +580,7 @@ public class PointServiceImpl implements PointService { .tag("吸食毒品") .eventTime(LocalDateTime.now()) .personId(personal.getId()) - .sourceData("发现该人员吸食毒品，增加风险分5分") + .sourceData("发现该人员吸食毒品" + dataString + "增加风险分5分") .build(); toInsert.add(createClue(task.getModelId(), 5, task.getId(), data)); } @@ -570,7 +594,6 @@ public class PointServiceImpl implements PointService { updateTask.setState(1); updateTask.setEndTime(LocalDateTime.now()); taskRepository.updateById(updateTask); - */ } @Override @@ -1487,4 +1510,20 @@ public class PointServiceImpl implements PointService { return org; } + private static String getDateString(String dateString) { + if (dateString != null) { + try { + LocalDateTime localDateTime = LocalDateTime.parse(dateString, DateTimeFormatter.ofPattern("yyyyMMddHHmmss")); + return localDateTime.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日")); + } catch (Exception e) { + try { + LocalDateTime localDateTime = LocalDateTime.parse(dateString, DateTimeFormatter.ofPattern("yyyyMMdd")); + return localDateTime.format(DateTimeFormatter.ofPattern("yyyy年MM月dd日")); + } catch (Exception ex) { + log.error("日期转换异常{}", dateString, ex); + } + } + } + return " 无时间数据 "; + } }