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

修复DayOfWeek转json异常问题

Browse Source
This commit is contained in:
Looly
2022-08-30 22:59:34 +08:00
parent 87a1cec9ed
commit 9fc7c40af9
5 changed files with 102 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hutool-core/src/main/java/cn/hutool/core/convert/ConverterRegistry.java
View File

@@ -52,11 +52,14 @@ import java.net.URI;
import java.net.URL;
import java.nio.charset.Charset;
import java.nio.file.Path;
import java.time.DayOfWeek;
import java.time.Duration;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.Month;
import java.time.MonthDay;
import java.time.OffsetDateTime;
import java.time.OffsetTime;
import java.time.Period;
@@ -427,6 +430,9 @@ public class ConverterRegistry implements Serializable {
defaultConverterMap.put(ZonedDateTime.class, new TemporalAccessorConverter(ZonedDateTime.class));
defaultConverterMap.put(OffsetDateTime.class, new TemporalAccessorConverter(OffsetDateTime.class));
defaultConverterMap.put(OffsetTime.class, new TemporalAccessorConverter(OffsetTime.class));
defaultConverterMap.put(DayOfWeek.class, new TemporalAccessorConverter(DayOfWeek.class));
defaultConverterMap.put(Month.class, new TemporalAccessorConverter(Month.class));
defaultConverterMap.put(MonthDay.class, new TemporalAccessorConverter(MonthDay.class));
defaultConverterMap.put(Period.class, new PeriodConverter());
defaultConverterMap.put(Duration.class, new DurationConverter());

30
hutool-core/src/main/java/cn/hutool/core/convert/impl/TemporalAccessorConverter.java
View File

@@ -6,14 +6,19 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import java.time.DayOfWeek;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.Month;
import java.time.MonthDay;
import java.time.OffsetDateTime;
import java.time.OffsetTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.chrono.Era;
import java.time.chrono.IsoEra;
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAccessor;
import java.util.Calendar;
@@ -120,6 +125,16 @@ public class TemporalAccessorConverter extends AbstractConverter<TemporalAccesso
return null;
}
if(DayOfWeek.class.equals(this.targetType)){
return DayOfWeek.valueOf(StrUtil.toString(value));
} else if(Month.class.equals(this.targetType)){
return Month.valueOf(StrUtil.toString(value));
} else if(Era.class.equals(this.targetType)){
return IsoEra.valueOf(StrUtil.toString(value));
} else if(MonthDay.class.equals(this.targetType)){
return MonthDay.parse(value);
}
final Instant instant;
ZoneId zoneId;
if (null != this.format) {
@@ -141,6 +156,13 @@ public class TemporalAccessorConverter extends AbstractConverter<TemporalAccesso
* @return java.time中的对象
*/
private TemporalAccessor parseFromLong(Long time) {
if(DayOfWeek.class.equals(this.targetType)){
return DayOfWeek.of(Math.toIntExact(time));
} else if(Month.class.equals(this.targetType)){
return Month.of(Math.toIntExact(time));
} else if(Era.class.equals(this.targetType)){
return IsoEra.of(Math.toIntExact(time));
}
return parseFromInstant(Instant.ofEpochMilli(time), null);
}
@@ -151,6 +173,14 @@ public class TemporalAccessorConverter extends AbstractConverter<TemporalAccesso
* @return java.time中的对象
*/
private TemporalAccessor parseFromTemporalAccessor(TemporalAccessor temporalAccessor) {
if(DayOfWeek.class.equals(this.targetType)){
return DayOfWeek.from(temporalAccessor);
} else if(Month.class.equals(this.targetType)){
return Month.from(temporalAccessor);
} else if(MonthDay.class.equals(this.targetType)){
return MonthDay.from(temporalAccessor);
}
TemporalAccessor result = null;
if (temporalAccessor instanceof LocalDateTime) {
result = parseFromLocalDateTime((LocalDateTime) temporalAccessor);