fix:离线删除设备

server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/OffBedAlarm.java

@@ -236,21 +236,28 @@ public class OffBedAlarm implements IAlarm {
             return;
             return;
         }
         }
 
 
-        LocalTime localTime = LocalTime.now().plusHours(7);
+        LocalTime localTime = LocalTime.now().plusHours(6);
         if (!isInTime && localTime.isAfter(startTime) && localTime.isBefore(endTime)) {
         if (!isInTime && localTime.isAfter(startTime) && localTime.isBefore(endTime)) {
             LocalDateTime dateTime = LocalDateTime.of(LocalDate.now(), startTime);
             LocalDateTime dateTime = LocalDateTime.of(LocalDate.now(), startTime);
             long mills = Duration.between(dateTime, currentTime()).toMillis() / 1000;
             long mills = Duration.between(dateTime, currentTime()).toMillis() / 1000;
             if (mills >= 86400) {
             if (mills >= 86400) {
+                log.info("uncross离床告警第一次离床时间在范围前,跨天了：mills：{}", mills);
                 mills = mills - 86400;
                 mills = mills - 86400;
             }
             }
+            if (mills <= -86400) {
+                log.info("uncross离床告警第一次离床时间在范围前,跨天了：mills：{}", mills);
+                mills = mills + 86400;
+            }
             boolean noInOverTime = mills >= duration * 60;
             boolean noInOverTime = mills >= duration * 60;
             if (noInOverTime) {
             if (noInOverTime) {
                 platAlarmCheckDTO.setAbnormalValue(String.valueOf(currentTimeMillis - firstOffBedLong));
                 platAlarmCheckDTO.setAbnormalValue(String.valueOf(currentTimeMillis - firstOffBedLong));
-                log.info("deviceId:{},uncross离床告警第一次离床时间在范围前,配置：{},date:{},mills：{}", deviceId, config.getRuleConfig(),dateTime,mills);
+                log.info("deviceId:{},uncross离床告警第一次离床时间在范围前,配置：{},date:{},mills：{},first:{}",
+                        deviceId, config.getRuleConfig(),dateTime,mills,firstTime);
                 platAlarmCheckDTO.setPlatAlarmConfig(config);
                 platAlarmCheckDTO.setPlatAlarmConfig(config);
                 noticeAlarm(alarmRedisDTO, platAlarmCheckDTO, deviceId);
                 noticeAlarm(alarmRedisDTO, platAlarmCheckDTO, deviceId);
             } else {
             } else {
-                log.info("deviceId:{},uncross离床告警第一次离床时间在范围前，未预警，配置：{}", deviceId, config.getRuleConfig());
+                log.info("deviceId:{},uncross离床告警第一次离床时间在范围前，未预警，配置：{}，间隔：{},first:{}",
+                        deviceId, config.getRuleConfig(), mills, firstTime);
             }
             }
         } else {
         } else {
             log.info("deviceId:{},UnCrossDay 未满足预警条件！fis:{},config:{}", deviceId, firstTime, config.getRuleConfig());
             log.info("deviceId:{},UnCrossDay 未满足预警条件！fis:{},config:{}", deviceId, firstTime, config.getRuleConfig());
@@ -327,7 +334,7 @@ public class OffBedAlarm implements IAlarm {
     }
     }
 
 
     private static LocalDateTime currentTime() {
     private static LocalDateTime currentTime() {
-        return LocalDateTime.now().plusHours(7);
+        return LocalDateTime.now().plusHours(6);
         // return LocalDateTime.now();
         // return LocalDateTime.now();
     }
     }