diff --git a/src/main/java/xyz/wbsite/jmacro/util/DateUtil.java b/src/main/java/xyz/wbsite/jmacro/util/DateUtil.java new file mode 100644 index 0000000..e5563af --- /dev/null +++ b/src/main/java/xyz/wbsite/jmacro/util/DateUtil.java @@ -0,0 +1,35 @@ +package xyz.wbsite.jmacro.util; + +import cn.hutool.core.date.DateTime; + +/** + * 日期工具. + * + * @author wangbing + * @version 0.0.1 + * @since 1.8 + */ +public class DateUtil extends cn.hutool.core.date.DateUtil { + + /** + * 判断指定日期的时间部分是否在指定时间区间 + * + * @param dateTime 日期 + * @param timeStart 开始时间 HH:mm:ss(包含) + * @param timeEnd 结束时间 HH:mm:ss(不包含) + * @return 是否在区间 + */ + public static boolean isTimeIn(DateTime dateTime, String timeStart, String timeEnd) { + String timeString = dateTime.toString("HH:mm:ss"); + + // 情况1:正常时间区间(开始时间 <= 结束时间) + if (timeStart.compareTo(timeEnd) <= 0) { + // 时间需要大于等于开始时间且小于结束时间 + return timeString.compareTo(timeStart) >= 0 && timeString.compareTo(timeEnd) < 0; + } else { + // 情况2:跨天时间区间(开始时间 > 结束时间) + // 时间要么大于等于开始时间(当天),要么小于结束时间(第二天) + return timeString.compareTo(timeStart) >= 0 || timeString.compareTo(timeEnd) < 0; + } + } +} \ No newline at end of file diff --git a/src/main/resources/icon.ico b/src/main/resources/icon.ico index 13e7865..2c7a1d2 100644 Binary files a/src/main/resources/icon.ico and b/src/main/resources/icon.ico differ diff --git a/src/main/resources/icon.png b/src/main/resources/icon.png index 9ec4f1d..96e8ab9 100644 Binary files a/src/main/resources/icon.png and b/src/main/resources/icon.png differ diff --git a/target/classes/icon.png b/target/classes/icon.png index adf116c..9ec4f1d 100644 Binary files a/target/classes/icon.png and b/target/classes/icon.png differ