diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/constant/Constants.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/constant/Constants.java index ec1d370..2c441ab 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/constant/Constants.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/constant/Constants.java @@ -218,6 +218,6 @@ public class Constants { public static ConcurrentHashMap scheduleRequestMap = new ConcurrentHashMap<>(); public static HashMap scheduleRequestDoneMap = new HashMap<>(); - public static final Integer Photo_Schedule_Delay = 5; + public static final Integer Photo_Schedule_Delay = 3; } \ No newline at end of file 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 3d5f356..a72cdb0 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 @@ -39,16 +39,11 @@ public class ScheduleDetailsDto implements Serializable { public boolean match(int min, int delay) { int cal = this.calMinute(); - if (cal == min) { + int r = Math.abs(min - cal); + if (r <= delay) { return true; - } else if (cal > min) { - return false; } else { - if (cal + delay >= min) { - return true; - } else { - return false; - } + return false; } }