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

解决CalendarUtil.isSameDay时区不同导致结果错误问题

Browse Source
This commit is contained in:
Looly
2024-04-16 17:28:56 +08:00
parent 604be1e9b2
commit c108cbf001
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
hutool-core/src/main/java/cn/hutool/core/date/CalendarUtil.java
View File

@@ -5,6 +5,7 @@ import cn.hutool.core.convert.NumberChineseFormatter;
import cn.hutool.core.date.format.DateParser;
import cn.hutool.core.date.format.FastDateParser;
import cn.hutool.core.date.format.GlobalCustomFormat;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -356,9 +357,10 @@ public class CalendarUtil {
throw new IllegalArgumentException("The date must not be null");
}
// 统一时区
cal1 = toDefaultTimeZone(cal1);
cal2 = toDefaultTimeZone(cal2);
if(ObjUtil.notEqual(cal1.getTimeZone(), cal2.getTimeZone())){
// 统一时区
cal2 = changeTimeZone(cal2, cal1.getTimeZone());
}
return cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR) && //
cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) && //
@@ -424,9 +426,10 @@ public class CalendarUtil {
throw new IllegalArgumentException("The date must not be null");
}
// 统一时区
cal1 = toDefaultTimeZone(cal1);
cal2 = toDefaultTimeZone(cal2);
if(ObjUtil.notEqual(cal1.getTimeZone(), cal2.getTimeZone())){
// 统一时区
cal2 = changeTimeZone(cal2, cal1.getTimeZone());
}
return cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) && //
cal1.get(Calendar.MONTH) == cal2.get(Calendar.MONTH) &&
@@ -805,10 +808,10 @@ public class CalendarUtil {
* @param cal 时间
* @return 默认时区的calendar对象
*/
private static Calendar toDefaultTimeZone(Calendar cal) {
private static Calendar changeTimeZone(Calendar cal, TimeZone timeZone) {
// 转换到统一时区，例如UTC
cal = (Calendar) cal.clone();
cal.setTimeZone(TimeZone.getDefault());
cal.setTimeZone(timeZone);
return cal;
}
}