From 2b6326ca94dc732a1ecfd804e160e09aa425e35b Mon Sep 17 00:00:00 2001
From: Looly <loolly@aliyun.com>
Date: Sat, 20 Apr 2024 16:52:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTemporalAccessorConverter?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=BC=E5=BC=8F=E8=BD=AC=E6=8D=A2?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 .../impl/TemporalAccessorConverter.java       | 53 ++++++++++++++-----
 2 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 692e88ddf..54b8d0b62 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 * 【core   】      解决CalendarUtil.isSameDay时区不同导致结果错误问题（pr#3548@Github）
 * 【core   】      修复RandomUtil.randomStringWithoutStr方法问题（pr#1209@Gitee）
 * 【http   】      修复HttpRequest.header相同key被覆盖问题（issue#I9I61C@Gitee）
+* 【core   】      修复TemporalAccessorConverter自定义格式转换问题（issue#I9HQQE@Gitee）
 
 -------------------------------------------------------------------------------------------------------------
 # 5.8.27(2024-03-29)
diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/TemporalAccessorConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/TemporalAccessorConverter.java
index 55a0d2ff9..3eb59fb4d 100644
--- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/TemporalAccessorConverter.java
+++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/TemporalAccessorConverter.java
@@ -117,7 +117,7 @@ public class TemporalAccessorConverter extends AbstractConverter<TemporalAccesso
 				return LocalDate.of(Convert.toInt(map.get("year")), Convert.toInt(map.get("month")), Convert.toInt(map.get("day")));
 			} else if (LocalDateTime.class.equals(this.targetType)) {
 				return LocalDateTime.of(Convert.toInt(map.get("year")), Convert.toInt(map.get("month")), Convert.toInt(map.get("day")),
-						Convert.toInt(map.get("hour")), Convert.toInt(map.get("minute")), Convert.toInt(map.get("second")), Convert.toInt(map.get("second")));
+					Convert.toInt(map.get("hour")), Convert.toInt(map.get("minute")), Convert.toInt(map.get("second")), Convert.toInt(map.get("second")));
 			} else if (LocalTime.class.equals(this.targetType)) {
 				return LocalTime.of(Convert.toInt(map.get("hour")), Convert.toInt(map.get("minute")), Convert.toInt(map.get("second")), Convert.toInt(map.get("nano")));
 			}
@@ -138,13 +138,13 @@ public class TemporalAccessorConverter extends AbstractConverter<TemporalAccesso
 			return null;
 		}
 
-		if(DayOfWeek.class.equals(this.targetType)){
+		if (DayOfWeek.class.equals(this.targetType)) {
 			return DayOfWeek.valueOf(StrUtil.toString(value));
-		} else if(Month.class.equals(this.targetType)){
+		} else if (Month.class.equals(this.targetType)) {
 			return Month.valueOf(StrUtil.toString(value));
-		} else if(Era.class.equals(this.targetType)){
+		} else if (Era.class.equals(this.targetType)) {
 			return IsoEra.valueOf(StrUtil.toString(value));
-		} else if(MonthDay.class.equals(this.targetType)){
+		} else if (MonthDay.class.equals(this.targetType)) {
 			return MonthDay.parse(value);
 		}
 
@@ -152,6 +152,13 @@ public class TemporalAccessorConverter extends AbstractConverter<TemporalAccesso
 		ZoneId zoneId;
 		if (null != this.format) {
 			final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(this.format);
+
+			// issue#I9HQQE
+			final TemporalAccessor temporalAccessor = parseWithFormat(this.targetType, value, formatter);
+			if (null != temporalAccessor) {
+				return temporalAccessor;
+			}
+
 			instant = formatter.parse(value, Instant::from);
 			zoneId = formatter.getZone();
 		} else {
@@ -162,6 +169,26 @@ public class TemporalAccessorConverter extends AbstractConverter<TemporalAccesso
 		return parseFromInstant(instant, zoneId);
 	}
 
+	/**
+	 * 对于自定义格式的字符串，单独解析为{@link TemporalAccessor}
+	 *
+	 * @param targetClass 目标类型
+	 * @param value       日期字符串
+	 * @param formatter   格式
+	 * @return {@link TemporalAccessor}
+	 */
+	private TemporalAccessor parseWithFormat(final Class<?> targetClass, final CharSequence value, final DateTimeFormatter formatter) {
+		// issue#I9HQQE
+		if (LocalDate.class == targetClass) {
+			return LocalDate.parse(value, formatter);
+		} else if (LocalDateTime.class == targetClass) {
+			return LocalDateTime.parse(value, formatter);
+		} else if (LocalTime.class == targetClass) {
+			return LocalTime.parse(value, formatter);
+		}
+		return null;
+	}
+
 	/**
 	 * 将Long型时间戳转换为java.time中的对象
 	 *
@@ -169,20 +196,20 @@ public class TemporalAccessorConverter extends AbstractConverter<TemporalAccesso
 	 * @return java.time中的对象
 	 */
 	private TemporalAccessor parseFromLong(Long time) {
-		if(DayOfWeek.class.equals(this.targetType)){
+		if (DayOfWeek.class.equals(this.targetType)) {
 			return DayOfWeek.of(Math.toIntExact(time));
-		} else if(Month.class.equals(this.targetType)){
+		} else if (Month.class.equals(this.targetType)) {
 			return Month.of(Math.toIntExact(time));
-		} else if(Era.class.equals(this.targetType)){
+		} else if (Era.class.equals(this.targetType)) {
 			return IsoEra.of(Math.toIntExact(time));
 		}
 
 		final Instant instant;
-		if(GlobalCustomFormat.FORMAT_SECONDS.equals(this.format)){
+		if (GlobalCustomFormat.FORMAT_SECONDS.equals(this.format)) {
 			// https://gitee.com/dromara/hutool/issues/I6IS5B
 			// Unix时间戳
 			instant = Instant.ofEpochSecond(time);
-		}else{
+		} else {
 			instant = Instant.ofEpochMilli(time);
 		}
 		return parseFromInstant(instant, null);
@@ -195,11 +222,11 @@ public class TemporalAccessorConverter extends AbstractConverter<TemporalAccesso
 	 * @return java.time中的对象
 	 */
 	private TemporalAccessor parseFromTemporalAccessor(TemporalAccessor temporalAccessor) {
-		if(DayOfWeek.class.equals(this.targetType)){
+		if (DayOfWeek.class.equals(this.targetType)) {
 			return DayOfWeek.from(temporalAccessor);
-		} else if(Month.class.equals(this.targetType)){
+		} else if (Month.class.equals(this.targetType)) {
 			return Month.from(temporalAccessor);
-		} else if(MonthDay.class.equals(this.targetType)){
+		} else if (MonthDay.class.equals(this.targetType)) {
 			return MonthDay.from(temporalAccessor);
 		}