Browse Source

手持表报警推送名称改成报警器内名称

master
wangwei_123 1 week ago
parent
commit
680941b426
  1. 7
      cc-admin-master/yudao-module-hand-mqtt/src/main/java/cn/iocoder/yudao/module/mqtt/processor/BatchDeviceMessageProcessor.java

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

@ -446,8 +446,11 @@ public class BatchDeviceMessageProcessor {
Double gasValue = json.getDouble("gas");
String loc = json.getStr("loc"); // Hutool 会把数组转成字符串 "[115, 39, 0]"
String battery = json.getStr("battery");
String user = json.getStr("user");
device.setUserName(user);
device.setValue(gasValue);
device.setSn(sn);
device.setBattery(battery);
@ -846,12 +849,12 @@ public class BatchDeviceMessageProcessor {
String statusText = isAlarming ? "报警" : "报警结束";
String msgContent = String.format("%s%s,%s气体浓度为%s",
handVo.getName(), statusText, gasName, valueStr);
handVo.getUserName(), statusText, gasName, valueStr);
// 记录报警消息日志
AlarmMessageLog alarmMessageLog = new AlarmMessageLog();
alarmMessageLog.setDetectorId(handVo.getId());
alarmMessageLog.setHolderName(handVo.getName());
alarmMessageLog.setHolderName(handVo.getUserName());
alarmMessageLog.setSn(handVo.getSn());
alarmMessageLog.setDeptId(handVo.getDeptId());
alarmMessageLog.setTenantId(handVo.getTenantId());

Loading…
Cancel
Save