From 93bb1e1859639da50d9cb746e12a792698163e08 Mon Sep 17 00:00:00 2001 From: wangwei_123 <1255324804@qq.com> Date: Tue, 27 Jan 2026 12:32:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E8=A1=A8=E6=89=B9=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/mqtt/config/BatchProcessorConfig.java | 1 - .../yudao/module/mqtt/config/TdengineBatchConfig.java | 1 + .../module/mqtt/processor/DeviceMessageProcessor.java | 18 +----------------- .../module/mqtt/processor/HandAlarmMessageProcess.java | 1 - .../yudao/module/hand/vo/AlarmDispatchEvent.java | 2 ++ 5 files changed, 4 insertions(+), 19 deletions(-) diff --git a/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/config/BatchProcessorConfig.java b/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/config/BatchProcessorConfig.java index 90c8ea6..b064b49 100644 --- a/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/config/BatchProcessorConfig.java +++ b/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秒 执行一次 ); } - } diff --git a/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/config/TdengineBatchConfig.java b/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/config/TdengineBatchConfig.java index 25400aa..07b2cf1 100644 --- a/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/config/TdengineBatchConfig.java +++ b/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; diff --git a/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/DeviceMessageProcessor.java b/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/DeviceMessageProcessor.java index e36e3e2..d14d2e5 100644 --- a/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/DeviceMessageProcessor.java +++ b/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 tdengineBatchConfig; @Resource - private TdengineBatchConfig 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); } /** diff --git a/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/HandAlarmMessageProcess.java b/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/HandAlarmMessageProcess.java index 3e1e8f9..720daa0 100644 --- a/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/HandAlarmMessageProcess.java +++ b/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; diff --git a/cc-admin-master/yudao-module-hand/src/main/java/cn/iocoder/yudao/module/hand/vo/AlarmDispatchEvent.java b/cc-admin-master/yudao-module-hand/src/main/java/cn/iocoder/yudao/module/hand/vo/AlarmDispatchEvent.java index 3cd7f7b..bd62abc 100644 --- a/cc-admin-master/yudao-module-hand/src/main/java/cn/iocoder/yudao/module/hand/vo/AlarmDispatchEvent.java +++ b/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;