From 15b9d2df72a102a605b93c121bc409fdd064da95 Mon Sep 17 00:00:00 2001
From: wxc <191104855@qq.com>
Date: Fri, 16 Jan 2026 17:43:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E4=B8=8B=E5=8F=91=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ModelClueServiceImpl.java    | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/ModelClueServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/ModelClueServiceImpl.java
index b49e2c9..e4df4b1 100644
--- a/src/main/java/com/biutag/supervisiondata/service/impl/ModelClueServiceImpl.java
+++ b/src/main/java/com/biutag/supervisiondata/service/impl/ModelClueServiceImpl.java
@@ -7,7 +7,6 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.biutag.supervisiondata.mapper.dwd.ModelClueDataMapper;
 import com.biutag.supervisiondata.mapper.mine.AlarmNotificationMapper;
@@ -119,6 +118,10 @@ public class ModelClueServiceImpl implements ModelClueService {
         }
         List<AlarmNotification> list = new ArrayList<>();
         for (ModelClue item : modelClues) {
+            // 已存在则跳过
+            if (alarmNotificationMapper.exists(new LambdaQueryWrapper<AlarmNotification>().eq(AlarmNotification::getAlarmContent, item.getThingDesc()))) {
+                continue;
+            }
             AlarmNotification notification = new AlarmNotification();
             notification.setAlarmTime(LocalDateTime.now());
             notification.setAlarmTypeId(3L);
@@ -271,10 +274,10 @@ public class ModelClueServiceImpl implements ModelClueService {
         // 无需更新状态的模型
         if (modelId != 19 && modelId != 26 && modelId != 27 && modelId != 28 && modelId != 30 && modelId != 100 ) {
             oldUniqueKeys = modelClueRepository.listObjs(new LambdaQueryWrapper<ModelClue>().select(ModelClue::getUniqueKey).ne(ModelClue::getDistributionState, "2").eq(ModelClue::getModelId, modelId), String::valueOf);
-            List<String> changeStatusIds = oldUniqueKeys.stream().filter(item -> !uniqueKeys.contains(item)).toList();
-            if (!changeStatusIds.isEmpty()) {
-                //modelClueMapper.update(null, new LambdaUpdateWrapper<ModelClue>().in(ModelClue::getUniqueKey, changeStatusIds).set(ModelClue::getDistributionState, "2"));
-            }
+//            List<String> changeStatusIds = oldUniqueKeys.stream().filter(item -> !uniqueKeys.contains(item)).toList();
+//            if (!changeStatusIds.isEmpty()) {
+//                modelClueMapper.update(null, new LambdaUpdateWrapper<ModelClue>().in(ModelClue::getUniqueKey, changeStatusIds).set(ModelClue::getDistributionState, "2"));
+//            }
         }
         List<String> needsInsertIds = new ArrayList<>();
         for (String uniqueKey : uniqueKeys) {
@@ -364,6 +367,11 @@ public class ModelClueServiceImpl implements ModelClueService {
                 involvePoliceEmpNo = Optional.ofNullable(map.get(modelGeneration.getInvolvePoliceEmpNo()))
                         .map(Object::toString).orElse("");
             }
+            Object uniqueKey = map.get(model.getClueUniqueFieldName());
+            // 如果 uniqueKey 为空，则跳过
+            if (Objects.isNull(uniqueKey)) {
+                continue;
+            }
             modelClues.add(new ModelClue()
                     .setModelId(modelId)
                     .setInvolveDepartName(involveDepartName)
@@ -373,8 +381,8 @@ public class ModelClueServiceImpl implements ModelClueService {
                     .setThingDesc(thingDescGeneration)
                     .setData(JSONObject.toJSONString(map))
                     .setDistributionState("0")
-                    .setUniqueKey(map.get(model.getClueUniqueFieldName()).toString())
-                    .setNegativeIdEx(map.get(model.getClueUniqueFieldName()).toString())
+                    .setUniqueKey(uniqueKey.toString())
+                    .setNegativeIdEx(uniqueKey.toString())
                     .setCreateTime(LocalDateTime.now()).setUpdateTime(LocalDateTime.now()));
         }
         System.out.println("自建模型" + modelId + "的modelClues数量为：" + modelClues.size());