This commit is contained in:
Looly 2022-04-19 19:04:38 +08:00
parent 3ef5ea6c86
commit befd56bbdb
2 changed files with 13 additions and 2 deletions

View File

@ -1813,7 +1813,7 @@ public class DateUtil extends CalendarUtil {
/**
* HH:mm:ss 时间格式字符串转为秒数<br>
* 参考https://github.com/iceroot
* 参考<a href="https://github.com/iceroot">https://github.com/iceroot</a>
*
* @param timeStr 字符串时分秒(HH:mm:ss)格式
* @return 时分秒转换后的秒数
@ -1836,7 +1836,7 @@ public class DateUtil extends CalendarUtil {
/**
* 秒数转为时间格式(HH:mm:ss)<br>
* 参考https://github.com/iceroot
* 参考<a href="https://github.com/iceroot">https://github.com/iceroot</a>
*
* @param seconds 需要转换的秒数
* @return 转换后的字符串

View File

@ -1029,6 +1029,7 @@ public class DateUtilTest {
}
@Test
@SuppressWarnings("ConstantConditions")
public void isOverlapTest() {
DateTime oneStartTime = DateUtil.parse("2022-01-01 10:10:10");
DateTime oneEndTime = DateUtil.parse("2022-01-01 11:10:10");
@ -1055,6 +1056,16 @@ public class DateUtilTest {
Assert.assertFalse(DateUtil.isOverlap(realStartTime1,realEndTime1,startTime,endTime));
Assert.assertFalse(DateUtil.isOverlap(startTime,endTime,realStartTime1,realEndTime1));
}
@Test
public void isInTest(){
String sourceStr = "2022-04-19 00:00:00";
String startTimeStr = "2022-04-19 00:00:00";
String endTimeStr = "2022-04-19 23:59:59";
boolean between = DateUtil.isIn(DateUtil.parse(startTimeStr),
DateUtil.parse(endTimeStr),
DateUtil.parse(sourceStr));
Assert.assertTrue(between);
}
}