Browse Source

fix: 新增注释

jackzhou 6 months ago
parent
commit
7098b4a215

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

@@ -14,7 +14,7 @@ public enum SensorAlarmType {
     DATA_ALARM("0","数据预警"),
     DATA_ALARM("0","数据预警"),
     SENSOR_OFF_LINE("1","传感器离线"),
     SENSOR_OFF_LINE("1","传感器离线"),
     DATA_RESTORE_ALARM("2","恢复数据预警"),
     DATA_RESTORE_ALARM("2","恢复数据预警"),
-    SENSOR_ON_LINE("3","设备上线");
+    SENSOR_ON_LINE("4","设备上线");
     private final String deviceCode;
     private final String deviceCode;
     private final String deviceName;
     private final String deviceName;
 
 

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

@@ -129,6 +129,7 @@ public class DeviceOfflineDetectionService {
                 log.warn("设备 {}-{} 已离线,最后上报时间:{}。", deviceCode, route, lastReportTimeStr);
                 log.warn("设备 {}-{} 已离线,最后上报时间:{}。", deviceCode, route, lastReportTimeStr);
                 publishAlarm(deviceCode, route, lastReportTimeStr);
                 publishAlarm(deviceCode, route, lastReportTimeStr);
             } else {
             } else {
+                // TODO怎么之前是离线才推送它上线
                 status = MonitorStatusEnum.ONLINE;
                 status = MonitorStatusEnum.ONLINE;
                 log.debug("设备 {}-{} 在线,最后上报时间:{}。", deviceCode, route, lastReportTimeStr);
                 log.debug("设备 {}-{} 在线,最后上报时间:{}。", deviceCode, route, lastReportTimeStr);
             }
             }

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

@@ -84,6 +84,10 @@ public class DefaultSensorAlarmChecker implements SensorAlarmChecker {
             // 低于下限,触发低于阈值报警
             // 低于下限,触发低于阈值报警
             publishAlarm(type + "过低", value, unit, time, lowerThreshold, monitorTargetRegion);
             publishAlarm(type + "过低", value, unit, time, lowerThreshold, monitorTargetRegion);
             alarmTriggered = true;
             alarmTriggered = true;
+        }else{
+            // SensorAlarmType.DATA_RESTORE_ALARM
+            log.info("针对异常设备数据恢复?设备正常");
+
         }
         }
         return alarmTriggered;
         return alarmTriggered;
     }
     }
@@ -123,6 +127,7 @@ public class DefaultSensorAlarmChecker implements SensorAlarmChecker {
         List<SensorAlarmUser> alarmUsers = monitorTargetRegion.getAlarmUsers();
         List<SensorAlarmUser> alarmUsers = monitorTargetRegion.getAlarmUsers();
         sensorAlarm.setAlarmUsers(alarmUsers);
         sensorAlarm.setAlarmUsers(alarmUsers);
         sensorAlarm.setThreshold(threshold);
         sensorAlarm.setThreshold(threshold);
+        // 修改TODO
         sensorAlarm.setType(SensorAlarmType.DATA_ALARM.getDeviceCode());
         sensorAlarm.setType(SensorAlarmType.DATA_ALARM.getDeviceCode());
         // 设置报警人机构 所属用户和机构
         // 设置报警人机构 所属用户和机构
         sensorAlarm.setCreateUser(monitorTargetRegion.getCreateUser());
         sensorAlarm.setCreateUser(monitorTargetRegion.getCreateUser());

+ 0 - 1
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/alarm/service/messagepush/RedisSensorAlarmMessagePushService.java

@@ -61,7 +61,6 @@ public class RedisSensorAlarmMessagePushService {
                     try {
                     try {
                         boolean b = pushService.sendAlarmMessage(alarm);
                         boolean b = pushService.sendAlarmMessage(alarm);
                         alarm.setNotified(b);
                         alarm.setNotified(b);
-                        log.info("$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$Alarm message sent successfully {},{}", channel.name(), alarm);
                     } catch (Exception e) {
                     } catch (Exception e) {
                         log.error("推送消息失败,渠道: {},错误: {}", channel.getChannelName(), e.getMessage());
                         log.error("推送消息失败,渠道: {},错误: {}", channel.getChannelName(), e.getMessage());
                     }
                     }