Browse Source

手持表报警推送修改

master
wangwei_123 5 hours ago
parent
commit
0017387250
  1. 1
      cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/BatchDeviceMessageProcessor.java
  2. 5
      cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/HandAlarmMessageProcess.java
  3. 2
      cc-admin-master/yudao-server/src/main/resources/application.yaml

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

@ -598,6 +598,7 @@ public class BatchDeviceMessageProcessor {
// 发送报警结束消息
sendAlarmMessage(handVo, alarmRule.getGasTypeName(), handVo.getValue(), false, context);
handVo.setLastPushValue(null);
handVo.setLastPushLevel(null);
HandAlarmDO alarmToEnd = new HandAlarmDO();
alarmToEnd.setId(handVo.getAlarmId());
alarmToEnd.setTAlarmEnd(now);

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

@ -62,7 +62,6 @@ public class HandAlarmMessageProcess {
}
// 3. 执行推送,收集实际成功推送的 SN 列表
// 【问题3 FIX】由 publishAlarmToMqtt 返回实际推送成功的列表,日志只记录成功项
List<String> succeededSns = publishAlarmToMqtt(targetSns, event.getMsgContent());
// 4. 记录报警消息日志(仅记录实际推送成功的 SN)
@ -120,4 +119,8 @@ public class HandAlarmMessageProcess {
return succeededSns;
}
public static void main(String[] args) {
}
}

2
cc-admin-master/yudao-server/src/main/resources/application.yaml

@ -2,7 +2,7 @@ spring:
application:
name: gas_mobile
profiles:
active: prod
active: dev
main:
allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。

Loading…
Cancel
Save