手持表批处理

cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/config/BatchProcessorConfig.java

@@ -39,5 +39,4 @@ public class BatchProcessorConfig {
                 5000 // 内部每 5秒 执行一次
         );
     }
-
 }

cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/config/TdengineBatchConfig.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.mqtt.config;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Configuration;
 
 import java.util.ArrayList;
 import java.util.Collection;

cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/DeviceMessageProcessor.java

@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
 
 @Slf4j
 @Component
-public class DeviceMessageProcessor {
+public class DeviceMessageProcessor {   
 
     private static final ObjectMapper objectMapper = new ObjectMapper();
     @Resource
@@ -42,16 +42,12 @@ public class DeviceMessageProcessor {
     private TdengineBatchConfig<TdengineDataVo> tdengineBatchConfig;
 
     @Resource
-    private TdengineBatchConfig<AlarmMessageLog> alarmProcessor;
-    @Resource
     private HandDetectorService handDetectorService;
     @Resource
     private HandAlarmService handAlarmService;
     @Resource
     private AlarmRuleService alarmRuleService;
     @Resource
-    private RedissonClient redissonClient;
-    @Resource
     private FenceService fenceService;
     @Resource
     private FenceAlarmService fenceAlarmService;
@@ -554,18 +550,6 @@ public class DeviceMessageProcessor {
                 }
             }
         });
-        //报警推送消息
-        AlarmMessageLog alarmMessageLog = new AlarmMessageLog();
-        alarmMessageLog.setDetectorId(redisData.getId());
-        alarmMessageLog.setHolderName(redisData.getName());
-        alarmMessageLog.setSn(redisData.getSn());
-        alarmMessageLog.setDeptId(redisData.getDeptId());
-        alarmMessageLog.setTenantId(redisData.getTenantId());
-        alarmMessageLog.setMessage(msgContent);
-        alarmMessageLog.setPushSnList(StringUtils.join(listAll, ","));
-        alarmMessageLog.setMessage(msgContent);
-        alarmMessageLog.setRemark("系统自动触发报警推送");
-        alarmProcessor.addToBatch(alarmMessageLog);
     }
 
     /**

cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/HandAlarmMessageProcess.java

@@ -5,7 +5,6 @@ import cn.iocoder.yudao.module.hand.service.HandDetectorService;
 import cn.iocoder.yudao.module.hand.service.TdengineService;
 import cn.iocoder.yudao.module.hand.vo.AlarmDispatchEvent;
 import cn.iocoder.yudao.module.hand.vo.AlarmMessageLog;
-import cn.iocoder.yudao.module.mqtt.config.TdengineBatchConfig;
 import cn.iocoder.yudao.module.mqtt.mqtt.Client;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.util.concurrent.RateLimiter;

cc-admin-master/yudao-module-hand/src/main/java/cn/iocoder/yudao/module/hand/vo/AlarmDispatchEvent.java

@@ -8,9 +8,11 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 public class AlarmDispatchEvent {
+    private Long id; //设备id
     private Long deptId;
     private Long tenantId;
     private String sourceSn;
+    private String userName;
 
     // 消息内容
     private String msgContent;