Merge remote-tracking branch 'origin/master'

src/main/java/com/biutag/supervisiondata/mapper/dwd/GBaseWFRXXMapper.java

@@ -35,7 +35,7 @@ public interface GBaseWFRXXMapper extends BaseMapper<GBaseWFRXX> {
      */
     @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<GBaseWFRXX> selectFiveYearsCombatCrime(@Param("startTime")String startTime, @Param("endTime")String endTime);
     /**
      * @return 列表

src/main/java/com/biutag/supervisiondata/pojo/ClueInfo.java

@@ -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<RiskModelTaskClue> toUpdate = new ArrayList<>();
-    /**
-     * 新增的信息
-     */
-    @Builder.Default
-    List<RiskModelTaskClue> toInsert = new ArrayList<>();
-    /**
-     * 隐藏的信息
-     */
-    @Builder.Default
-    List<RiskModelTaskClue> toHidden = new ArrayList<>();
-
-}

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;
+}

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) {
@@ -341,7 +341,9 @@ public class GBaseJJDServiceImpl implements GBaseJJDService {
                 List<String> 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<String> 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);
                 }

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) {

src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java

@@ -174,7 +174,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));
         }
@@ -224,7 +224,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));
         }
@@ -852,7 +852,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());