snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/alarm/bean/SensorAlarm.java

@@ -49,7 +49,7 @@ public class SensorAlarm extends OrgEntity {
     /**
      * 预警类型(0:数据异常 1:设备离线)
      */
-    @Schema(description = "类型")
+    @Schema(description = "类型SensorAlarmType")
     private String type;
 
     /**

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

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

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);
                 publishAlarm(deviceCode, route, lastReportTimeStr);
             } else {
+                // TODO怎么之前是离线才推送它上线
                 status = MonitorStatusEnum.ONLINE;
                 log.debug("设备 {}-{} 在线，最后上报时间：{}。", deviceCode, route, lastReportTimeStr);
             }
@@ -181,7 +182,7 @@ public class DeviceOfflineDetectionService {
         sensorAlarm.setThreshold(0f);
         // 设置报警人机构 所属用户和机构
         sensorAlarm.setCreateUser(monitorTargetRegion.getCreateUser());
-        sensorAlarm.setType(SensorAlarmType.SENSOR_OFFLINE.getDeviceCode());
+        sensorAlarm.setType(SensorAlarmType.SENSOR_OFF_LINE.getDeviceCode());
         sensorAlarm.setCreateOrg(monitorTargetRegion.getCreateOrg());
         sensorAlarm.setRoomName(monitorTargetRegion.getRoomName());
         log.warn("设备断电报警: 类型: {},详细报警内容 : {}", alarmType, alarmMessage);

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/alarm/service/SensorAlarmServiceImpl.java

@@ -99,7 +99,7 @@ public class SensorAlarmServiceImpl extends ServiceImpl<SensorAlarmMapper, Senso
         queryWrapper.lambda().eq(SensorAlarm::getCreateOrg, orgId);
         final String type = messagePageParam.getType();
         if(StrUtil.isNotBlank(type) && type.trim().equalsIgnoreCase("system")){
-            queryWrapper.lambda().eq(SensorAlarm::getType, SensorAlarmType.SENSOR_OFFLINE.getDeviceCode());
+            queryWrapper.lambda().eq(SensorAlarm::getType, SensorAlarmType.SENSOR_OFF_LINE.getDeviceCode());
         }else{
             queryWrapper.lambda().eq(SensorAlarm::getType, SensorAlarmType.DATA_ALARM.getDeviceCode());
         }

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);
             alarmTriggered = true;
+        }else{
+            // SensorAlarmType.DATA_RESTORE_ALARM
+            log.info("针对异常设备数据恢复?设备正常");
+
         }
         return alarmTriggered;
     }
@@ -123,6 +127,7 @@ public class DefaultSensorAlarmChecker implements SensorAlarmChecker {
         List<SensorAlarmUser> alarmUsers = monitorTargetRegion.getAlarmUsers();
         sensorAlarm.setAlarmUsers(alarmUsers);
         sensorAlarm.setThreshold(threshold);
+        // 修改TODO
         sensorAlarm.setType(SensorAlarmType.DATA_ALARM.getDeviceCode());
         // 设置报警人机构 所属用户和机构
         sensorAlarm.setCreateUser(monitorTargetRegion.getCreateUser());

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 {
                         boolean b = pushService.sendAlarmMessage(alarm);
                         alarm.setNotified(b);
-                        log.info("$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$Alarm message sent successfully {}，{}", channel.name(), alarm);
                     } catch (Exception e) {
                         log.error("推送消息失败，渠道: {}，错误: {}", channel.getChannelName(), e.getMessage());
                     }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/core/service/JfcloudSensorDataService.java

@@ -290,11 +290,11 @@ public class JfcloudSensorDataService extends JfcloudFluxDataService<SensorData>
     }
 
     public long getCurrentMonthOfflineCount(String sensorCode, String sensorRoute) {
-        return getAlarmCount(sensorCode, sensorRoute, SensorAlarmType.SENSOR_OFFLINE, false);
+        return getAlarmCount(sensorCode, sensorRoute, SensorAlarmType.SENSOR_OFF_LINE, false);
     }
 
     public long getLastMonthOfflineCount(String sensorCode, String sensorRoute) {
-        return getAlarmCount(sensorCode, sensorRoute, SensorAlarmType.SENSOR_OFFLINE, true);
+        return getAlarmCount(sensorCode, sensorRoute, SensorAlarmType.SENSOR_OFF_LINE, true);
     }
 
 }