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

修复DateUtil.rangeContains未重置问题（issue#IB8OFS@gitee）

Browse Source
This commit is contained in:
Looly
2024-12-04 00:29:00 +08:00
parent af5cddf80f
commit 843d1d11dc
3 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1975,8 +1975,8 @@ public class DateUtil extends CalendarUtil {
* @since 5.7.21
*/
public static List<DateTime> rangeContains(DateRange start, DateRange end) {
List<DateTime> startDateTimes = CollUtil.newArrayList((Iterable<DateTime>) start);
List<DateTime> endDateTimes = CollUtil.newArrayList((Iterable<DateTime>) end);
List<DateTime> startDateTimes = CollUtil.newArrayList((Iterable<DateTime>) start.reset());
List<DateTime> endDateTimes = CollUtil.newArrayList((Iterable<DateTime>) end.reset());
return startDateTimes.stream().filter(endDateTimes::contains).collect(Collectors.toList());
}
@@ -1990,8 +1990,8 @@ public class DateUtil extends CalendarUtil {
* @since 5.7.21
*/
public static List<DateTime> rangeNotContains(DateRange start, DateRange end) {
List<DateTime> startDateTimes = CollUtil.newArrayList((Iterable<DateTime>) start);
List<DateTime> endDateTimes = CollUtil.newArrayList((Iterable<DateTime>) end);
List<DateTime> startDateTimes = CollUtil.newArrayList((Iterable<DateTime>) start.reset());
List<DateTime> endDateTimes = CollUtil.newArrayList((Iterable<DateTime>) end.reset());
return endDateTimes.stream().filter(item -> !startDateTimes.contains(item)).collect(Collectors.toList());
}

25
hutool-core/src/test/java/cn/hutool/core/date/IssueIB8OFSTest.java Normal file
View File

@@ -0,0 +1,25 @@
package cn.hutool.core.date;
import cn.hutool.core.lang.Console;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.util.List;
public class IssueIB8OFSTest {
@Test
void rangeTest() {
DateRange startRange = DateUtil.range(
DateUtil.parse("2017-01-01"),
DateUtil.parse("2017-01-31"), DateField.DAY_OF_YEAR);
DateRange endRange = DateUtil.range(
DateUtil.parse("2017-01-31"),
DateUtil.parse("2017-02-02"), DateField.DAY_OF_YEAR);
List<DateTime> dateTimes = DateUtil.rangeContains(startRange, endRange);
Assertions.assertEquals(1, dateTimes.size());
List<DateTime> dateNotTimes = DateUtil.rangeNotContains(startRange, endRange);
Assertions.assertEquals(2, dateNotTimes.size());
}
}