fix:回退代码

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

@@ -151,9 +151,6 @@ public class OffBedAlarm implements IAlarm {
 
         Long firstOffBedLong = alarmRedisDTO.getStartLong();
         long currentTimeMillis = System.currentTimeMillis();
-        LocalDateTime nowTest = LocalDateTime.now().plusHours(5).plusMinutes(45);
-        currentTimeMillis = nowTest.toInstant(ZoneOffset.of("+8")).toEpochMilli();
-        log.info("handleCrossDay，测试当前的时间：{},时间戳：{}", nowTest, currentTimeMillis);
         boolean isOverTime = (currentTimeMillis - firstOffBedLong) / 1000 >= duration * 60;
         LocalDateTime firstOffBedTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(firstOffBedLong), ZoneOffset.of("+8"));
         LocalTime firstTime = firstOffBedTime.toLocalTime();
@@ -173,8 +170,7 @@ public class OffBedAlarm implements IAlarm {
             noticeAlarm(alarmRedisDTO, platAlarmCheckDTO, deviceId);
             return;
         }
-        // LocalDateTime now = LocalDateTime.now();
-        LocalDateTime now  = LocalDateTime.now().plusHours(5).plusMinutes(50);;
+        LocalDateTime now = LocalDateTime.now();
         LocalDateTime startLocalDteTime = LocalDateTime.of(LocalDate.now(), startTime);
         if (!isInTime) {
             long mills = Duration.between(startLocalDteTime, now).toMillis() / 1000;
@@ -194,11 +190,6 @@ public class OffBedAlarm implements IAlarm {
 
     }
 
-    public static void main(String[] args) {
-        LocalDateTime now = LocalDateTime.now().plusHours(5).plusMinutes(45);
-        System.out.println(now);
-    }
-
     private void handleUnCrossDay(AlarmRedisDTO alarmRedisDTO, PlatAlarmConfigOffBedDTOVO ruleConfig,
                                   PlatAlarmCheckDTO platAlarmCheckDTO,
                                   PlatAlarmConfig config,
@@ -212,8 +203,6 @@ public class OffBedAlarm implements IAlarm {
 
         Long firstOffBedLong = alarmRedisDTO.getStartLong();
         long currentTimeMillis = System.currentTimeMillis();
-        LocalDateTime nowTest = LocalDateTime.now().plusHours(5).plusMinutes(45);
-        currentTimeMillis = nowTest.toInstant(ZoneOffset.of("+8")).toEpochMilli();
         boolean isOverTime = (currentTimeMillis - firstOffBedLong) / 1000 >= duration * 60;
         LocalDateTime firstOffBedTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(firstOffBedLong), ZoneOffset.of("+8"));
         LocalTime firstTime = firstOffBedTime.toLocalTime();
@@ -239,7 +228,7 @@ public class OffBedAlarm implements IAlarm {
             return;
         }
 
-        LocalDateTime now = LocalDateTime.now().plusHours(5).plusMinutes(45);
+        LocalDateTime now = LocalDateTime.now();
         if (!isInTime && now.isAfter(startLocalDteTime) && now.isBefore(endLocalDteTime)) {
             long mills = Duration.between(startLocalDteTime, now).toMillis() / 1000;
             boolean noInOverTime = mills >= duration * 60;