From 1a5e35fb4d52d126c65ee5cfd73eaef3c21a79b1 Mon Sep 17 00:00:00 2001 From: wangwei_123 <1255324804@qq.com> Date: Fri, 23 Jan 2026 16:16:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mqtt=E6=8A=A5=E8=AD=A6?= =?UTF-8?q?=E6=8E=A8=E9=80=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/iocoder/yudao/module/mqtt/config/BatchProcessorConfig.java | 2 +- .../yudao/module/mqtt/processor/BatchDeviceMessageProcessor.java | 4 +++- .../iocoder/yudao/module/mqtt/processor/HandAlarmMessageProcess.java | 2 +- .../module/system/controller/admin/user/vo/user/UserSimpleRespVO.java | 3 +++ 4 files changed, 8 insertions(+), 3 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 ae414cd..0de167a 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 @@ -35,7 +35,7 @@ public class BatchProcessorConfig { "handLogBatchDataProcessor", list -> tdengineService.saveDataLogBatch(list), 50000, - 2000, + 1000, 5000 // 内部每 5秒 执行一次 ); } diff --git a/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/BatchDeviceMessageProcessor.java b/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/BatchDeviceMessageProcessor.java index 069ebb9..8cee290 100644 --- a/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/BatchDeviceMessageProcessor.java +++ b/cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/BatchDeviceMessageProcessor.java @@ -178,7 +178,8 @@ public class BatchDeviceMessageProcessor { processGasAlarm(handVo, alarmRule, context); // 7. 电池报警处理 - processBatteryAlarm(handVo, context); + handVo.setBatteryStatus(EnableStatus.DISABLED.value()); + //processBatteryAlarm(handVo, context); // 8. 围栏报警处理 processFenceAlarm(handVo, context); @@ -643,6 +644,7 @@ public class BatchDeviceMessageProcessor { newAlarm.setCreator("system"); newAlarm.setCreateTime(now); newAlarm.setDeptId(handVo.getDeptId()); + newAlarm.setUnit(handVo.getUnit()); newAlarm.setAlarmLevel(HandAlarmType.ALARM.getType()); context.gasAlarmsToCreate.add(newAlarm); 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 6fea5b9..bedcb72 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 @@ -56,7 +56,7 @@ public class HandAlarmMessageProcess { * 执行 MQTT 推送 (包含限流) */ private void publishAlarmToMqtt(List targetSns, String message) { - if (message != null) { + if (message == null) { return; } // 构造 MQTT 消息体 diff --git a/cc-admin-master/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java b/cc-admin-master/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java index 69833e5..b3905ba 100644 --- a/cc-admin-master/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java +++ b/cc-admin-master/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java @@ -25,4 +25,7 @@ public class UserSimpleRespVO { @Schema(description = "部门名称", example = "IT 部") private String mobile; + + @Schema(description = "用户头像", example = "https://www.iocoder.cn/xxx.png") + private String avatar; }