Răsfoiți Sursa

fix: SensorAlarmType 预警类型

jackzhou 5 luni în urmă
părinte
comite
27af53f678

+ 24 - 0
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/alarm/enums/SensorAlarmType.java

@@ -0,0 +1,24 @@
+package vip.xiaonuo.coldchain.core.alarm.enums;
+
+import lombok.Getter;
+
+/**
+ * @author jackzhou
+ * @version 1.0
+ * @project jfcloud-coldchain
+ * @description
+ * @date 2025/1/6 13:04:49
+ */
+@Getter
+public enum SensorAlarmType {
+    DATA_ALARM("0","数据预警"),
+    SENSOR_OFFLINE("1","传感器离线");
+    private final String deviceCode;
+    private final String deviceName;
+
+    // 构造方法
+    SensorAlarmType(String deviceCode, String deviceName) {
+        this.deviceCode = deviceCode;
+        this.deviceName = deviceName;
+    }
+}

+ 3 - 1
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/alarm/offline/DeviceOfflineDetectionService.java

@@ -9,6 +9,7 @@ import org.springframework.stereotype.Service;
 import vip.xiaonuo.coldchain.core.alarm.bean.SensorAlarm;
 import vip.xiaonuo.coldchain.core.alarm.bean.SensorAlarmUser;
 import vip.xiaonuo.coldchain.core.alarm.config.ColdChainAlarmMessageProperties;
+import vip.xiaonuo.coldchain.core.alarm.enums.SensorAlarmType;
 import vip.xiaonuo.coldchain.core.event.SensorAlarmEvent;
 import vip.xiaonuo.coldchain.core.renke.config.JfcloudColdChainServerProperties;
 import vip.xiaonuo.coldchain.modular.monitortarget.enums.MonitorStatusEnum;
@@ -152,7 +153,8 @@ public class DeviceOfflineDetectionService {
         sensorAlarm.setThreshold(0f);
         // 设置报警人机构 所属用户和机构
         sensorAlarm.setCreateUser(monitorTargetRegion.getCreateUser());
-        sensorAlarm.setType("1");
+        sensorAlarm.setType(SensorAlarmType.SENSOR_OFFLINE.getDeviceCode());
+        sensorAlarm.setRoomName(monitorTargetRegion.getRoomName());
         log.warn("设备断电报警: 类型: {},详细报警内容 : {}", alarmType, alarmMessage);
         // 发布报警事件
         applicationEventPublisher.publishEvent(new SensorAlarmEvent(this, sensorAlarm));

+ 2 - 1
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/alarm/service/check/DefaultSensorAlarmChecker.java

@@ -9,6 +9,7 @@ import vip.xiaonuo.coldchain.core.alarm.bean.SensorAlarm;
 import vip.xiaonuo.coldchain.core.alarm.bean.SensorAlarmUser;
 import vip.xiaonuo.coldchain.core.alarm.bean.SensorThreshold;
 import vip.xiaonuo.coldchain.core.alarm.config.ColdChainAlarmMessageProperties;
+import vip.xiaonuo.coldchain.core.alarm.enums.SensorAlarmType;
 import vip.xiaonuo.coldchain.core.alarm.offline.DeviceOfflineDetectionService;
 import vip.xiaonuo.coldchain.core.alarm.service.threshold.SensorThresholdService;
 import vip.xiaonuo.coldchain.core.bean.influxdb.SensorData;
@@ -122,7 +123,7 @@ public class DefaultSensorAlarmChecker implements SensorAlarmChecker {
         List<SensorAlarmUser> alarmUsers = monitorTargetRegion.getAlarmUsers();
         sensorAlarm.setAlarmUsers(alarmUsers);
         sensorAlarm.setThreshold(threshold);
-        sensorAlarm.setType("0");
+        sensorAlarm.setType(SensorAlarmType.DATA_ALARM.getDeviceCode());
         // 设置报警人机构 所属用户和机构
         sensorAlarm.setCreateUser(monitorTargetRegion.getCreateUser());
         sensorAlarm.setCreateOrg(monitorTargetRegion.getCreateOrg());