修改22、101号模型

src/main/java/com/biutag/supervision/service/ModelClueService.java

@@ -867,7 +867,18 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
         if (sqlList.isEmpty()) {
             return;
         }
+        List<Map<String, Object>> jjdData = modelClueDataMapper.selectByUniqueKeys("SELECT DISTINCT jjdbh FROM dwd_asj_zhtx_jjd WHERE jqxzmc like '%举报%' AND (bjnr like '%嫖%' or bjnr like '%涉黄%'or bjnr like '%淫%'or bjnr like '%有偿%'or bjnr like '%陪侍%' or bjnr like '%私人影院%'   or bjnr like '%脱衣舞%'or bjnr like '%打飞机%'or bjnr like '%全套%'or bjnr like '%半套%'or bjnr like '%卡片%'or bjnr like '%色情%'or bjnr like '%拉客%'or bjnr like '%站街%'or bjnr like '%裸嗨%'or bjnr like '%摸摸看%'or bjnr like '%摸摸唱%'or bjnr like '%黄色%'or bjnr like '%发卡%'or bjnr like '%赌%'or bjnr like '%三公%'or bjnr like '%斗牛%'or bjnr like '%德州%'or bjnr like '%扑克%'or bjnr like '%十三水%'or bjnr like '%麻将%'or bjnr like '%打牌%'or bjnr like '%打大牌%'or bjnr like '%牌九%'or bjnr like '%赌博机%'or bjnr like '%打鱼机%'or bjnr like '%老虎机%'or bjnr like '%苹果机%'or bjnr like '%六合彩%') AND bjsj>'2024-10-01 00:00:00';");
+        List<String> jjdbhList = new ArrayList<>();
+        for (Map<String, Object> map : jjdData) {
+            String jjdbh = (String) map.get("jjdbh");
+            if (jjdbh != null && !jjdbh.isEmpty()) {
+                jjdbhList.add(jjdbh);
+            }
+        }
         for (Map<String, Object> map : sqlList) {
+            if (!jjdbhList.contains((String)map.get("jjdbh"))) {
+                continue;
+            }
             ModelClue newModelClue = new ModelClue();
             newModelClue.setUniqueKey("");
             newModelClue.setNegativeIdEx("");
@@ -1255,7 +1266,7 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
             return "SELECT a.*, b.fkrbh, b.fkrxm FROM " + tableName + " a left join dwd_asj_zhtx_fkd b on a.jjdbh = b.jjdbh " + "WHERE a." + originalFieldName + " IN " + "(" + uniqueKeys.stream().map(k -> "'" + k + "'").collect(Collectors.joining(",")) + ");";
         }
         if (modelId == 101) {
-            return "SELECT * FROM " + tableName + " a join dwd_ry_jgzhxt_zyryxx b on a.ZHENGJIANHAOMA = b.idcard_no " + "WHERE a." + originalFieldName + " IN " + "(" + uniqueKeys.stream().map(k -> "'" + k + "'").collect(Collectors.joining(",")) + ");";
+            return "SELECT * FROM " + tableName + " a join dwd_ry_jgzhxt_zyryxx b on a.ZHENGJIANHAOMA = b.idcard_no " + "WHERE a." + originalFieldName + " IN " + "(" + uniqueKeys.stream().map(k -> "'" + k + "'").collect(Collectors.joining(",")) + ") AND b.come_date > '2024-10-01 00:00:00';";
         }
         return "SELECT * FROM " + tableName + " " + "WHERE " + originalFieldName + " IN " + "(" + uniqueKeys.stream().map(k -> "'" + k + "'").collect(Collectors.joining(",")) + ");";
     }