Merge remote-tracking branch 'origin/dev' into dev

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

@@ -212,9 +212,7 @@ public class OffBedAlarm implements IAlarm {
         log.info("deviceId:{},uncross_config:{},第一次离床时间:{}", deviceId, config.getRuleConfig(), longToTime(alarmRedisDTO.getStartLong()));
         log.info("deviceId:{},uncross_config:{},第一次离床时间:{}", deviceId, config.getRuleConfig(), longToTime(alarmRedisDTO.getStartLong()));
         Integer duration = ruleConfig.getDuration();
         Integer duration = ruleConfig.getDuration();
         LocalTime startTime = ruleConfig.getOffBedStart();
         LocalTime startTime = ruleConfig.getOffBedStart();
-        // LocalDateTime startLocalDteTime = LocalDateTime.of(LocalDate.now(), startTime);
         LocalTime endTime = ruleConfig.getOffBedEnd();
         LocalTime endTime = ruleConfig.getOffBedEnd();
-        // LocalDateTime endLocalDteTime = LocalDateTime.of(LocalDate.now(), endTime);
 
 
         Long firstOffBedLong = alarmRedisDTO.getStartLong();
         Long firstOffBedLong = alarmRedisDTO.getStartLong();
         long currentTimeMillis = currentLong();
         long currentTimeMillis = currentLong();
@@ -236,7 +234,7 @@ public class OffBedAlarm implements IAlarm {
             return;
             return;
         }
         }
 
 
-        LocalTime localTime = LocalTime.now().plusHours(6);
+        LocalTime localTime = LocalTime.now().plusHours(6).plusMinutes(25);
         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;
@@ -334,7 +332,7 @@ public class OffBedAlarm implements IAlarm {
     }
     }
 
 
     private static LocalDateTime currentTime() {
     private static LocalDateTime currentTime() {
-        return LocalDateTime.now().plusHours(6);
+        return LocalDateTime.now().plusHours(6).plusMinutes(25);
         // return LocalDateTime.now();
         // return LocalDateTime.now();
     }
     }