diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/ScheduleDetailsDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/ScheduleDetailsDto.java index 11503e0..c552b99 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/ScheduleDetailsDto.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/ScheduleDetailsDto.java @@ -21,6 +21,9 @@ public class ScheduleDetailsDto implements Serializable { public void initMinute(int min) { hour = min / 60; minute = min - hour * 60; + if (hour >= 24) { + hour = hour - 24; + } } public int calMinute() { diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CameraScheduleServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CameraScheduleServiceImpl.java index 5168f0b..671a431 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CameraScheduleServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CameraScheduleServiceImpl.java @@ -91,6 +91,9 @@ public class CameraScheduleServiceImpl implements CameraScheduleService { int interval = first.getHour() * 60 + first.getMinute(); int start = second.getHour() * 60 + second.getMinute(); int end = third.getHour() * 60 + third.getMinute(); + if (end < start) { + end = end + 24 * 60; + } List result = new ArrayList<>(); while (start < end) {