fix:离床时间跨天处理

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

@@ -79,6 +79,10 @@ public class OffBedAlarm implements IAlarm {
             log.error("离床告警配置解析失败，config:{}", JSONUtil.toJsonStr(config));
             log.error("离床告警配置解析失败，config:{}", JSONUtil.toJsonStr(config));
             return;
             return;
         }
         }
+        if (!"0".equals(ruleConfig.getStartTimeType())
+                || ruleConfig.getOffBedStart().isAfter(ruleConfig.getOffBedEnd())) {
+            return;
+        }
         JSONObject properties = platAlarmCheckDTO.getProperties();
         JSONObject properties = platAlarmCheckDTO.getProperties();
         if (properties == null) {
         if (properties == null) {
             properties = new JSONObject();
             properties = new JSONObject();
@@ -93,6 +97,7 @@ public class OffBedAlarm implements IAlarm {
         LocalDateTime startTime = timeRange.get(0);
         LocalDateTime startTime = timeRange.get(0);
         LocalDateTime endTime = timeRange.get(1);
         LocalDateTime endTime = timeRange.get(1);
         Integer duration = ruleConfig.getDuration();
         Integer duration = ruleConfig.getDuration();
+        boolean isNextDay = "1".equals(ruleConfig.getEndTimeType());
         String personState = Convert.toStr(properties.get("person"));
         String personState = Convert.toStr(properties.get("person"));
         boolean isOffBed = "0".equals(personState);
         boolean isOffBed = "0".equals(personState);
         // 1-有人 0-无人
         // 1-有人 0-无人
@@ -133,7 +138,9 @@ public class OffBedAlarm implements IAlarm {
                     return;
                     return;
                 }
                 }
             }
             }
-
+            if (isNextDay) {
+                endTime = endTime.plusDays(1);
+            }
             LocalDateTime validEndTime = endTime.plusMinutes(duration);
             LocalDateTime validEndTime = endTime.plusMinutes(duration);
             // 离床时间在范围时间内（小于范围结束时间-持续分钟）
             // 离床时间在范围时间内（小于范围结束时间-持续分钟）
             boolean isOffBedValid = firstOffBedTime.isAfter(startTime) && firstOffBedTime.isBefore(validEndTime);
             boolean isOffBedValid = firstOffBedTime.isAfter(startTime) && firstOffBedTime.isBefore(validEndTime);
@@ -187,9 +194,8 @@ public class OffBedAlarm implements IAlarm {
 
 
     public static void main(String[] args) {
     public static void main(String[] args) {
         LocalDateTime startTime = LocalDateTime.of(2023,12,12,15,43);
         LocalDateTime startTime = LocalDateTime.of(2023,12,12,15,43);
-        boolean over = (Math.abs(Duration.between(LocalDateTime.now(), startTime).toMillis())) / 1000 >= 2 * 60;
-        System.out.println(over);
-        System.out.println(Duration.between(LocalDateTime.now(), startTime).toMillis());
+        System.out.println(startTime);
+        System.out.println(startTime.plusDays(1));
     }
     }
 
 
     private void sendToRedis(AlarmRedisDTO alarmRedisDTO, String deviceId) {
     private void sendToRedis(AlarmRedisDTO alarmRedisDTO, String deviceId) {