From 6cf56d67689b26619d77dc695f0d799faf0c3e91 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Thu, 16 Apr 2026 13:49:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=BD=AE=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E6=80=A7bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DataRecallController.java           |  4 ++--
 .../consumer/DeviceRunFlagDataConsumer.java        | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataRecallController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataRecallController.java
index 67fa509..77397c5 100644
--- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataRecallController.java
+++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataRecallController.java
@@ -343,7 +343,7 @@ public class DataRecallController extends BaseController {
                     }
 
                     if(recallType ==3){
-                        return;
+//                        return;
                     }else if(recallType ==2){
                         Integer timeInterval = data.getTimeInterval();
                         List<LocalDateTime> localDateTimeList = generateTimeIntervals(finalCurrentDate, timeInterval);
@@ -353,7 +353,7 @@ public class DataRecallController extends BaseController {
                             List<String> timePeriod = mergeTimeIntervals(localDateTimeList, timeInterval);
                             //最大时间段为300
                             if(timePeriod.size()<300){
-                                RecallMessage.RecallDTO recallDTO = new RecallMessage.RecallDTO();
+                                RecallMessage.RecallDTO recallDTO = new  RecallMessage.RecallDTO();
                                 recallDTO.setDataType("0");
                                 recallDTO.setMonitorId(Stream.of(temp).collect(Collectors.toList()));
                                 recallDTO.setTimeInterval(timePeriod);
diff --git a/message/message-boot/src/main/java/com/njcn/message/consumer/DeviceRunFlagDataConsumer.java b/message/message-boot/src/main/java/com/njcn/message/consumer/DeviceRunFlagDataConsumer.java
index 61a202c..755432a 100644
--- a/message/message-boot/src/main/java/com/njcn/message/consumer/DeviceRunFlagDataConsumer.java
+++ b/message/message-boot/src/main/java/com/njcn/message/consumer/DeviceRunFlagDataConsumer.java
@@ -84,15 +84,19 @@ public class DeviceRunFlagDataConsumer extends EnhanceConsumerMessageHandler<Dev
     @Override
     protected void handleMessage(DevComFlagDTO message) {
         //获取之前设备状态
-        String devFalg =redisUtil.getStringByKey(RedisKeyPrefix.DEVICE_RUN_FLAG.concat(message.getId()));
+        //删除设备时前置会在连接一次通道但是DevId为空所以添加
+        if(StringUtils.isNoneBlank(message.getId())){
+            String devFalg =redisUtil.getStringByKey(RedisKeyPrefix.DEVICE_RUN_FLAG.concat(message.getId()));
 
-        if(StringUtils.isBlank(devFalg)||(!Objects.equals(Integer.valueOf(devFalg),message.getStatus()))){
-            //状态翻转
-            messAnalysisFeignClient.handleDevRunflag(message);
-            redisUtil.saveByKey(RedisKeyPrefix.DEVICE_RUN_FLAG.concat(message.getId()),message.getStatus()+"");
+            if(StringUtils.isBlank(devFalg)||(!Objects.equals(Integer.valueOf(devFalg),message.getStatus()))){
+                //状态翻转
+                messAnalysisFeignClient.handleDevRunflag(message);
+                redisUtil.saveByKey(RedisKeyPrefix.DEVICE_RUN_FLAG.concat(message.getId()),message.getStatus()+"");
 
+            }
         }
 
+
     }