Browse Source

修改mqtt报警推送bug

master
wangwei_123 1 week ago
parent
commit
1a5e35fb4d
  1. 2
      cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/config/BatchProcessorConfig.java
  2. 4
      cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/BatchDeviceMessageProcessor.java
  3. 2
      cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/HandAlarmMessageProcess.java
  4. 3
      cc-admin-master/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java

2
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", "handLogBatchDataProcessor",
list -> tdengineService.saveDataLogBatch(list), list -> tdengineService.saveDataLogBatch(list),
50000, 50000,
2000,
1000,
5000 // 内部每 5秒 执行一次 5000 // 内部每 5秒 执行一次
); );
} }

4
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); processGasAlarm(handVo, alarmRule, context);
// 7. 电池报警处理 // 7. 电池报警处理
processBatteryAlarm(handVo, context);
handVo.setBatteryStatus(EnableStatus.DISABLED.value());
//processBatteryAlarm(handVo, context);
// 8. 围栏报警处理 // 8. 围栏报警处理
processFenceAlarm(handVo, context); processFenceAlarm(handVo, context);
@ -643,6 +644,7 @@ public class BatchDeviceMessageProcessor {
newAlarm.setCreator("system"); newAlarm.setCreator("system");
newAlarm.setCreateTime(now); newAlarm.setCreateTime(now);
newAlarm.setDeptId(handVo.getDeptId()); newAlarm.setDeptId(handVo.getDeptId());
newAlarm.setUnit(handVo.getUnit());
newAlarm.setAlarmLevel(HandAlarmType.ALARM.getType()); newAlarm.setAlarmLevel(HandAlarmType.ALARM.getType());
context.gasAlarmsToCreate.add(newAlarm); context.gasAlarmsToCreate.add(newAlarm);

2
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 推送 (包含限流) * 执行 MQTT 推送 (包含限流)
*/ */
private void publishAlarmToMqtt(List<String> targetSns, String message) { private void publishAlarmToMqtt(List<String> targetSns, String message) {
if (message != null) {
if (message == null) {
return; return;
} }
// 构造 MQTT 消息体 // 构造 MQTT 消息体

3
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 部") @Schema(description = "部门名称", example = "IT 部")
private String mobile; private String mobile;
@Schema(description = "用户头像", example = "https://www.iocoder.cn/xxx.png")
private String avatar;
} }

Loading…
Cancel
Save