zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
Looly
2022-03-22 19:02:44 +08:00
parent 538200bdc3
commit 6e86079e7e
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -51,6 +51,7 @@
* 【json 】 修复JSON对Map.Entry的解析问题 * 【json 】 修复JSON对Map.Entry的解析问题
* 【core 】 修复MapConverter中map与map转换兼容问题 * 【core 】 修复MapConverter中map与map转换兼容问题
* 【poi 】 解决sax读取时，POI-5.2.x兼容性问题 * 【poi 】 解决sax读取时，POI-5.2.x兼容性问题
* 【core 】 修复修复判断两段时间区间交集问题（pr#2210@Github）
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------
# 5.7.22 (2022-03-01) # 5.7.22 (2022-03-01)

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

@@ -2197,6 +2197,9 @@ public class DateUtil extends CalendarUtil {
public static boolean isOverlap(Date realStartTime, Date realEndTime, public static boolean isOverlap(Date realStartTime, Date realEndTime,
Date startTime, Date endTime) { Date startTime, Date endTime) {
// x>b||a>y 无交集
// 则有交集的逻辑为 !(x>b||a>y)
// 根据德摩根公式，可化简为 x<=b && a<=y
return startTime.before(realEndTime) && endTime.after(realStartTime); return startTime.before(realEndTime) && endTime.after(realStartTime);
} }

4
hutool-core/src/main/java/cn/hutool/core/date/LocalDateTimeUtil.java
View File

@@ -564,6 +564,10 @@ public class LocalDateTimeUtil {
*/ */
public static boolean isOverlap(ChronoLocalDateTime<?> realStartTime, ChronoLocalDateTime<?> realEndTime, public static boolean isOverlap(ChronoLocalDateTime<?> realStartTime, ChronoLocalDateTime<?> realEndTime,
ChronoLocalDateTime<?> startTime, ChronoLocalDateTime<?> endTime) { ChronoLocalDateTime<?> startTime, ChronoLocalDateTime<?> endTime) {
// x>b||a>y 无交集
// 则有交集的逻辑为 !(x>b||a>y)
// 根据德摩根公式，可化简为 x<=b && a<=y
return startTime.isBefore(realEndTime) && endTime.isAfter(realStartTime); return startTime.isBefore(realEndTime) && endTime.isAfter(realStartTime);
} }