fix:离床时间跨天处理

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

@@ -95,9 +95,8 @@ public class OffBedAlarm implements IAlarm {
             return;
             return;
         }
         }
         LocalDateTime startTime = timeRange.get(0);
         LocalDateTime startTime = timeRange.get(0);
-        LocalDateTime endTime = timeRange.get(1);
+        LocalDateTime endTime = "1".equals(ruleConfig.getEndTimeType()) ? timeRange.get(1).plusDays(1) : 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-无人
@@ -138,9 +137,6 @@ 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);
@@ -193,9 +189,11 @@ 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);
-        System.out.println(startTime);
-        System.out.println(startTime.plusDays(1));
+        LocalDateTime startTime = LocalDateTime.of(2023, 12, 12, 23, 59);
+        long second = startTime.toInstant(ZoneOffset.of("+8")).toEpochMilli();
+        LocalDateTime firstOffBedTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(second), ZoneOffset.of("+8"));
+        System.out.println(second);
+        System.out.println(firstOffBedTime);
     }
     }
 
 
     private void sendToRedis(AlarmRedisDTO alarmRedisDTO, String deviceId) {
     private void sendToRedis(AlarmRedisDTO alarmRedisDTO, String deviceId) {