修改前置兼容性bug

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

message/message-boot/src/main/java/com/njcn/message/consumer/DeviceRunFlagDataConsumer.java

@@ -84,6 +84,8 @@ public class DeviceRunFlagDataConsumer extends EnhanceConsumerMessageHandler<Dev
     @Override
     protected void handleMessage(DevComFlagDTO message) {
         //获取之前设备状态
+        //删除设备时前置会在连接一次通道但是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()))){
@@ -92,6 +94,8 @@ public class DeviceRunFlagDataConsumer extends EnhanceConsumerMessageHandler<Dev
                 redisUtil.saveByKey(RedisKeyPrefix.DEVICE_RUN_FLAG.concat(message.getId()),message.getStatus()+"");
 
             }
+        }
+
 
     }