From ac4bfca6bb52a27a21d9e7b0a6bfad5478c2d349 Mon Sep 17 00:00:00 2001 From: Looly Date: Mon, 28 Feb 2022 18:21:02 +0800 Subject: [PATCH] add method --- .../main/java/cn/hutool/core/date/DateUtil.java | 2 +- .../java/cn/hutool/core/date/DateUtilTest.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java index a2e7b7867..6df40341a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java @@ -2192,7 +2192,7 @@ public class DateUtil extends CalendarUtil { * @param startTime 第二个时间段的开始时间 * @param endTime 第二个时间段的结束时间 * @return true 表示时间有重合 - * @since 5.7.20 + * @since 5.7.22 */ public static boolean isOverlap(Date realStartTime, Date realEndTime, Date startTime, Date endTime) { diff --git a/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java index 5cf171134..7f7fcd81e 100644 --- a/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java @@ -1030,18 +1030,18 @@ public class DateUtilTest { @Test public void isOverlapTest() { - DateTime oneStartTime = DateTime.of("2022-01-01 10:10:10", DatePattern.NORM_DATETIME_PATTERN); - DateTime oneEndTime = DateTime.of("2022-01-01 11:10:10", DatePattern.NORM_DATETIME_PATTERN); + DateTime oneStartTime = DateUtil.parse("2022-01-01 10:10:10"); + DateTime oneEndTime = DateUtil.parse("2022-01-01 11:10:10"); - DateTime oneStartTime2 = DateTime.of("2022-01-01 11:20:10", DatePattern.NORM_DATETIME_PATTERN); - DateTime oneEndTime2 = DateTime.of("2022-01-01 11:30:10", DatePattern.NORM_DATETIME_PATTERN); + DateTime oneStartTime2 = DateUtil.parse("2022-01-01 11:20:10"); + DateTime oneEndTime2 = DateUtil.parse("2022-01-01 11:30:10"); - DateTime oneStartTime3 = DateTime.of("2022-01-01 11:40:10", DatePattern.NORM_DATETIME_PATTERN); - DateTime oneEndTime3 = DateTime.of("2022-01-01 11:50:10", DatePattern.NORM_DATETIME_PATTERN); + DateTime oneStartTime3 = DateUtil.parse("2022-01-01 11:40:10"); + DateTime oneEndTime3 = DateUtil.parse("2022-01-01 11:50:10"); //真实请假数据 - DateTime realStartTime = DateTime.of("2022-01-01 11:49:10", DatePattern.NORM_DATETIME_PATTERN); - DateTime realEndTime = DateTime.of("2022-01-01 12:00:10", DatePattern.NORM_DATETIME_PATTERN); + DateTime realStartTime = DateUtil.parse("2022-01-01 11:49:10"); + DateTime realEndTime = DateUtil.parse("2022-01-01 12:00:10"); Assert.assertTrue(DateUtil.isOverlap(oneStartTime, oneEndTime, realStartTime, realEndTime)); Assert.assertTrue(DateUtil.isOverlap(oneStartTime2, oneEndTime2, realStartTime, realEndTime));