From 67ddcfa50a2cb9a8b3c42306abe6d7605312fe05 Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Sat, 7 Dec 2024 18:14:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=B6=E6=9A=B4=E4=B8=8E=E8=A2=AB?= =?UTF-8?q?=E5=AE=B6=E6=9A=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/dwd/GBaseWFRXXMapper.java | 2 +- .../biutag/supervisiondata/pojo/ClueInfo.java | 47 ------------------- .../pojo/entity/wdpc/WdpcGrjdZblx.java | 29 ++++++++++++ .../service/impl/GBaseJJDServiceImpl.java | 2 +- .../service/impl/PersonalServiceImpl.java | 1 + .../service/impl/PointServiceImpl.java | 6 +-- 6 files changed, 35 insertions(+), 52 deletions(-) delete mode 100644 src/main/java/com/biutag/supervisiondata/pojo/ClueInfo.java create mode 100644 src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc/WdpcGrjdZblx.java 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 7642c58..f6e9c71 100644 --- a/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRXXMapper.java +++ b/src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRXXMapper.java @@ -35,7 +35,7 @@ public interface GBaseWFRXXMapper extends BaseMapper { */ @Select(" select ajbh,zjhm,sxzm,lrsj from dwd_ry_zfba_wfryxx " + " where lrsj between #{startTime} and #{endTime} " + - " and ajbh is not null") + " and ajbh is not null and zjhm is not null") List selectFiveYearsCombatCrime(@Param("startTime")String startTime, @Param("endTime")String endTime); /** * @return 列表 diff --git a/src/main/java/com/biutag/supervisiondata/pojo/ClueInfo.java b/src/main/java/com/biutag/supervisiondata/pojo/ClueInfo.java deleted file mode 100644 index 80aa370..0000000 --- a/src/main/java/com/biutag/supervisiondata/pojo/ClueInfo.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.biutag.supervisiondata.pojo; - -import com.biutag.supervisiondata.pojo.entity.mine.RiskModelTaskClue; -import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -import java.io.Serial; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -/** - * @author kami on 2024-11-10 15:55:50 - * @version 0.0.1 - * @since 1.8 - */ -@Data -@Builder -@Slf4j -@AllArgsConstructor -@NoArgsConstructor(force = true) -@JsonInclude(JsonInclude.Include.NON_NULL) -public class ClueInfo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - /** - * 修改的信息 - */ - @Builder.Default - List toUpdate = new ArrayList<>(); - /** - * 新增的信息 - */ - @Builder.Default - List toInsert = new ArrayList<>(); - /** - * 隐藏的信息 - */ - @Builder.Default - List toHidden = new ArrayList<>(); - -} diff --git a/src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc/WdpcGrjdZblx.java b/src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc/WdpcGrjdZblx.java new file mode 100644 index 0000000..7bf4cd9 --- /dev/null +++ b/src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc/WdpcGrjdZblx.java @@ -0,0 +1,29 @@ +package com.biutag.supervisiondata.pojo.entity.wdpc; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author kami on 2024-12-07 18:03:58 + * @version 0.0.1 + * @since 1.8 + */ +@Data +@TableName("`wdpc_grjd_zblx`") +public class WdpcGrjdZblx implements Serializable { + @TableId(value = "`id`", type= IdType.AUTO) + Integer id; + @TableField("`dmbh`") + String dmbh; + @TableField("`dmmc`") + String dmmc; + @TableField("`lxdm`") + String lxdm; + @TableField("`score`") + Double score; +} diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java index edda8b6..1bb6e4d 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java @@ -165,7 +165,7 @@ public class GBaseJJDServiceImpl implements GBaseJJDService { } if (personal.getMobileNumber() != null && info == null) { xxxInfo = mobileMap.get(personal.getMobileNumber()); - if (xxxInfo == null && xxxInfo.isEmpty()) { + if (xxxInfo != null && !xxxInfo.isEmpty()) { info = compare(xxxInfo, personal.getName()); } if (info == null && xxxInfo != null) { 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 e1230aa..7b20966 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/PersonalServiceImpl.java @@ -451,6 +451,7 @@ public class PersonalServiceImpl implements PersonalService { person.setGender(IdCodeUtil.idCard2Gender(ry.getIdCode())); person.setCreateTime(LocalDateTime.now()); person.setControlTime(LocalDateTime.now()); + person.setControlDepartType(DepartType.OTHER.getType()); if(xx != null) { SupExternalDepart depart = hope.get(xx.getSspcsdm()); if(depart == null) { 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 ac8f719..ef5d894 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java @@ -171,7 +171,7 @@ public class PointServiceImpl implements PointService { } try { data.setEventTime(violence.getBarq().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); - } catch (Exception e) { + } catch (Exception ignored) { } toInsert.add(createClue2(task.getModelId(), 5, task.getId(), data)); } @@ -221,7 +221,7 @@ public class PointServiceImpl implements PointService { } try { data.setEventTime(extreme.getBjsj().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime()); - } catch (Exception e) { + } catch (Exception ignored) { } toInsert.add(createClue2(task.getModelId(), 10, task.getId(), data)); } @@ -744,7 +744,7 @@ public class PointServiceImpl implements PointService { call.setNoUsefulCallCount(noUsefulNum); call.setLabels(mark.substring(0, mark.length() - 1)); call.setName(personal.getName()); - call.setMobiles(mobile.length() == 0 ? "" : mobile.substring(0, mobile.length() - 1)); + call.setMobiles(mobile.isEmpty() ? "" : mobile.substring(0, mobile.length() - 1)); call.setIdCode(personal.getIdCode()); call.setControlId(personal.getControlDepartId()); call.setControlName(personal.getControlDepartName()); From f17e75ee84ca325dd3c692323c3a6ddf8248c8f9 Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Sat, 7 Dec 2024 18:22:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=B6=E6=9A=B4=E4=B8=8E=E8=A2=AB?= =?UTF-8?q?=E5=AE=B6=E6=9A=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GBaseJJDServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java index 1bb6e4d..1b48c29 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java @@ -341,7 +341,9 @@ public class GBaseJJDServiceImpl implements GBaseJJDService { List tmp = Arrays.stream(idCard.split(",")).toList(); // 如果有多个号码，防止警察证件被录入 if (tmp.size() > 1) { - tmp.remove(0); + for (int i = 1; i < tmp.size(); i++) { + mobiles.add(tmp.get(i)); + } } idCodes.addAll(tmp); for (String s : tmp) { @@ -357,9 +359,10 @@ public class GBaseJJDServiceImpl implements GBaseJJDService { List tmp = Arrays.stream(idCard.split(",")).toList(); // 如果有多个号码，防止警察证件被录入 if (tmp.size() > 1) { - tmp.remove(0); + for (int i = 1; i < tmp.size(); i++) { + mobiles.add(tmp.get(i)); + } } - mobiles.addAll(tmp); for (String s : tmp) { mobileMap.computeIfAbsent(s, k -> new ArrayList<>()).add(gBaseJJD); }