lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-05-07 22:27:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add method

Browse Source
This commit is contained in:
Looly 2022-02-28 18:21:02 +08:00
parent c1f9ef1ff5
commit ac4bfca6bb
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java
View File

@ -2192,7 +2192,7 @@ public class DateUtil extends CalendarUtil {
* @param startTime 第二个时间段的开始时间 * @param startTime 第二个时间段的开始时间
* @param endTime 第二个时间段的结束时间 * @param endTime 第二个时间段的结束时间
* @return true 表示时间有重合 * @return true 表示时间有重合
* @since 5.7.20 * @since 5.7.22
*/ */
public static boolean isOverlap(Date realStartTime, Date realEndTime, public static boolean isOverlap(Date realStartTime, Date realEndTime,
Date startTime, Date endTime) { Date startTime, Date endTime) {

16
hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java
View File

@ -1030,18 +1030,18 @@ public class DateUtilTest {
@Test @Test
public void isOverlapTest() { public void isOverlapTest() {
DateTime oneStartTime = DateTime.of("2022-01-01 10:10:10", DatePattern.NORM_DATETIME_PATTERN); DateTime oneStartTime = DateUtil.parse("2022-01-01 10:10:10");
DateTime oneEndTime = DateTime.of("2022-01-01 11:10:10", DatePattern.NORM_DATETIME_PATTERN); 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 oneStartTime2 = DateUtil.parse("2022-01-01 11:20:10");
DateTime oneEndTime2 = DateTime.of("2022-01-01 11:30:10", DatePattern.NORM_DATETIME_PATTERN); 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 oneStartTime3 = DateUtil.parse("2022-01-01 11:40:10");
DateTime oneEndTime3 = DateTime.of("2022-01-01 11:50:10", DatePattern.NORM_DATETIME_PATTERN); 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 realStartTime = DateUtil.parse("2022-01-01 11:49:10");
DateTime realEndTime = DateTime.of("2022-01-01 12:00:10", DatePattern.NORM_DATETIME_PATTERN); DateTime realEndTime = DateUtil.parse("2022-01-01 12:00:10");
Assert.assertTrue(DateUtil.isOverlap(oneStartTime, oneEndTime, realStartTime, realEndTime)); Assert.assertTrue(DateUtil.isOverlap(oneStartTime, oneEndTime, realStartTime, realEndTime));
Assert.assertTrue(DateUtil.isOverlap(oneStartTime2, oneEndTime2, realStartTime, realEndTime)); Assert.assertTrue(DateUtil.isOverlap(oneStartTime2, oneEndTime2, realStartTime, realEndTime));