信访表

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

@@ -23,8 +23,8 @@ public interface GBaseJJDMapper extends BaseMapper<GBaseJJD> {
 
 
     @Select(" select bjdh as mobile, " +
-            " sum(IF(SUBSTR(jqxzdm, 1, 1) != '9',1,0)) as normal, " +
-            " sum(IF(SUBSTR(jqxzdm, 1, 1) = '9',1,0)) as unNormal " +
+            " sum(IF(SUBSTR(jqxzdm, 1, 2) != '99' AND SUBSTR(jqxzdm, 1, 2) != '11',1,0)) as normal, " +
+            " sum(IF(SUBSTR(jqxzdm, 1, 2) = '99',1,0) or SUBSTR(jqxzdm, 1, 2) = '11') as unNormal " +
             " from dwd_asj_zhtx_jjd where bjsj >= '2024-01-01 00:00:00' and bjdh is not null " +
             " group by bjdh HAVING sum(IF(SUBSTR(jqxzdm, 1, 1) != '9',1,0)) > 5 or  sum(IF(SUBSTR(jqxzdm, 1, 1) = '9',1,0)) > 100")
     List<MuchCall> selectPointCall();

src/main/java/com/biutag/supervisiondata/mapper/wdpc/WdpcRyLgXXMapper.java

@@ -0,0 +1,12 @@
+package com.biutag.supervisiondata.mapper.wdpc;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcRyLgXX;
+
+/**
+ * @author kami on 2024-12-05 11:28:59
+ * @version 0.0.1
+ * @since 1.8
+ */
+public interface WdpcRyLgXXMapper extends BaseMapper<WdpcRyLgXX> {
+}

src/main/java/com/biutag/supervisiondata/pojo/constants/Default.java

@@ -48,6 +48,8 @@ public class Default {
 
     public static final String NO_CAR_OIL_BUY = "无车近3月购买散装油记录";
 
+    public static final String INVESTIGATE_FOUR = "四无人员";
+
 
     // ***********因素*************
     public static final String AGE_IG = "年龄因素";

src/main/java/com/biutag/supervisiondata/pojo/entity/wdpc/WdpcRyLgXX.java

@@ -0,0 +1,30 @@
+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;
+
+/**
+ * 四无人员
+ * @author kami on 2024-12-05 11:25:45
+ * @version 0.0.1
+ * @since 1.8
+ */
+@Data
+@TableName("`wdpc_ry_lgxx`")
+public class WdpcRyLgXX {
+    @TableId(value = "id",type = IdType.AUTO)
+    Integer id;
+    @TableField("`xm`")
+    String xm;
+    @TableField("`lxdh`")
+    String lxdh;
+    @TableField("`sfzh`")
+    String sfzh;
+    @TableField("`gxdwbh`")
+    String gxdwbh;
+    @TableField("`gxdwmc`")
+    String gxdwmc;
+}

src/main/java/com/biutag/supervisiondata/repository/WdpcRyLgXXRepository.java

@@ -0,0 +1,15 @@
+package com.biutag.supervisiondata.repository;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.biutag.supervisiondata.mapper.wdpc.WdpcRyLgXXMapper;
+import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcRyLgXX;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author kami on 2024-12-05 11:29:55
+ * @version 0.0.1
+ * @since 1.8
+ */
+@Service
+public class WdpcRyLgXXRepository extends ServiceImpl<WdpcRyLgXXMapper, WdpcRyLgXX> {
+}

src/main/java/com/biutag/supervisiondata/rest/ApiController.java

@@ -69,7 +69,9 @@ public class ApiController {
         List<String> mobiles = obj.getList("mobiles", String.class);
         List<String> idCodes = obj.getList("idCodes", String.class);
 
-        RedisDao.getInstance().opsForHashSave("jjd_cache_tmp", obj.getString("id"), obj.toJSONString());
+        RedisDao.getInstance().opsForHashSave("jjd_cache_idCodes", obj.getString("id"), String.join(",", idCodes));
+        RedisDao.getInstance().opsForHashSave("jjd_cache_mobile", obj.getString("id"), String.join(",", mobiles));
+
 
         return JSONObject.of("id", obj.getString("id"), "data", String.format(Prompt.CONTENT, obj.getString("name"),
                 obj.getString("idCode"),
@@ -93,9 +95,11 @@ public class ApiController {
         }
         GBaseJJD jjd = JSON.parseObject(str, GBaseJJD.class);
 
-        String tmp = (String) RedisDao.getInstance().opsForHashGetByGroupAndKey("jjd_cache_tmp", jjd.getJjdbh());
-        RedisDao.getInstance().opsForHashDel("jjd_cache_tmp", jjd.getJjdbh());
-        JSONObject temp = JSON.parseObject(tmp);
+
+        String idCodesCache = (String) RedisDao.getInstance().opsForHashGetByGroupAndKey("jjd_cache_idCodes", jjd.getJjdbh());
+        String mobilesCache = (String) RedisDao.getInstance().opsForHashGetByGroupAndKey("jjd_cache_mobile", jjd.getJjdbh());
+        RedisDao.getInstance().opsForHashDel("jjd_cache_idCodes", jjd.getJjdbh());
+        RedisDao.getInstance().opsForHashDel("jjd_cache_mobile", jjd.getJjdbh());
 
         String res = data.getString("content");
         res = res.replaceFirst("```json","").replaceAll("```", "").replaceAll("\n","");
@@ -122,8 +126,8 @@ public class ApiController {
             ai.setIdCode(Optional.ofNullable(obj.getString("idCode")).orElse(""));
             ai.setReason(obj.getString("reason"));
 
-            ai.setIdCodes(String.join(",",temp.getList("idCodes", String.class)));
-            ai.setMobiles(String.join(",",temp.getList("mobiles", String.class)));
+            ai.setIdCodes(Optional.ofNullable(idCodesCache).orElse(""));
+            ai.setMobiles(Optional.ofNullable(mobilesCache).orElse(""));
             if(!ai.getIdCode().isEmpty() && !ai.getIdCode().equals("暂无")) {
                 idCodes.add(ai.getIdCode());
             }

src/main/java/com/biutag/supervisiondata/service/PersonalService.java

@@ -34,7 +34,14 @@ public interface PersonalService {
      */
     void pullCriminal(LocalDateTime start);
 
+    /**
+     * 另一个表的信访
+     */
     void pullPetitionAgain();
+    /**
+     * 推送排查人员（四无）
+     */
+    void pullInvestigate();
 
     void init();
 }

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

@@ -10,6 +10,7 @@ import com.biutag.supervisiondata.pojo.entity.dwd.GBaseZDRY;
 import com.biutag.supervisiondata.pojo.entity.mine.*;
 import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcGrjdXfsj;
 import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcGrjdXfsjCs;
+import com.biutag.supervisiondata.pojo.entity.wdpc.WdpcRyLgXX;
 import com.biutag.supervisiondata.pojo.enums.DepartType;
 import com.biutag.supervisiondata.repository.*;
 import com.biutag.supervisiondata.service.PersonalService;
@@ -319,6 +320,33 @@ public class PersonalServiceImpl implements PersonalService {
         riskPersonalService.saveDistinct(personals);
     }
 
+    private  final WdpcRyLgXXRepository lgXXRepository;
+
+    @Override
+    public void pullInvestigate() {
+        List<WdpcRyLgXX> xxList = lgXXRepository.list(new LambdaQueryWrapper<WdpcRyLgXX>().select(WdpcRyLgXX::getXm,WdpcRyLgXX::getSfzh,WdpcRyLgXX::getGxdwmc,WdpcRyLgXX::getGxdwbh,WdpcRyLgXX::getLxdh));
+        LocalDate now = LocalDate.now();
+        List<RiskPersonal> personals = new ArrayList<>();
+        for (WdpcRyLgXX wdpcRyLgXX : xxList) {
+            RiskPersonal person = new RiskPersonal();
+            person.setName(wdpcRyLgXX.getXm());
+            person.setMobileNumber(wdpcRyLgXX.getLxdh());
+            person.setControlDepartId(wdpcRyLgXX.getGxdwbh());
+            person.setControlDepartName(wdpcRyLgXX.getGxdwmc());
+            person.setControlDepartType(DepartType.OTHER.getType());
+            person.setIdCode(wdpcRyLgXX.getSfzh().toUpperCase());
+            person.setCreateTime(LocalDateTime.now());
+            person.setAge(IdCodeUtil.idCard2Age(person.getIdCode(), now));
+            person.setGender(IdCodeUtil.idCard2Gender(person.getIdCode()));
+            person.setControlTime(LocalDateTime.now());
+            person.setTags(Default.INVESTIGATE_FOUR);
+            personals.add(person);
+        }
+        if(!personals.isEmpty()) {
+            riskPersonalService.saveDistinct(personals);
+        }
+    }
+
     private final RiskTestRepository riskTestRepository;
 
     @Override