From 86ba812a9340afdc74a583002e017b5a926f0e3d Mon Sep 17 00:00:00 2001
From: Looly <loolly@aliyun.com>
Date: Thu, 21 Sep 2023 13:06:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BTemporalAccessorSerializer?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81dayOfMonth=E5=92=8Cmonth=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serialize/TemporalAccessorSerializer.java | 48 ++++++++++++++++---
 .../dromara/hutool/json/IssueI82AM8Test.java  | 43 +++++++++++++++++
 .../src/test/resources/issueI82AM8.json       | 46 ++++++++++++++++++
 3 files changed, 131 insertions(+), 6 deletions(-)
 create mode 100644 hutool-json/src/test/java/org/dromara/hutool/json/IssueI82AM8Test.java
 create mode 100644 hutool-json/src/test/resources/issueI82AM8.json

diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/serialize/TemporalAccessorSerializer.java b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/TemporalAccessorSerializer.java
index 211c96fd6..df0f39eb4 100644
--- a/hutool-json/src/main/java/org/dromara/hutool/json/serialize/TemporalAccessorSerializer.java
+++ b/hutool-json/src/main/java/org/dromara/hutool/json/serialize/TemporalAccessorSerializer.java
@@ -12,6 +12,8 @@
 
 package org.dromara.hutool.json.serialize;
 
+import org.dromara.hutool.core.lang.Assert;
+import org.dromara.hutool.core.math.NumberUtil;
 import org.dromara.hutool.json.JSON;
 import org.dromara.hutool.json.JSONException;
 import org.dromara.hutool.json.JSONObject;
@@ -19,6 +21,7 @@ import org.dromara.hutool.json.JSONObject;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.time.Month;
 import java.time.temporal.TemporalAccessor;
 
 /**
@@ -83,13 +86,46 @@ public class TemporalAccessorSerializer implements JSONSerializer<JSONObject, Te
 	@Override
 	public TemporalAccessor deserialize(final JSON json) {
 		final JSONObject jsonObject = (JSONObject) json;
-		if (LocalDate.class.equals(this.temporalAccessorClass)) {
-			return LocalDate.of(jsonObject.getInt(YEAR_KEY), jsonObject.getInt(MONTH_KEY), jsonObject.getInt(DAY_KEY));
-		} else if (LocalDateTime.class.equals(this.temporalAccessorClass)) {
-			return LocalDateTime.of(jsonObject.getInt(YEAR_KEY), jsonObject.getInt(MONTH_KEY), jsonObject.getInt(DAY_KEY),
-					jsonObject.getInt(HOUR_KEY), jsonObject.getInt(MINUTE_KEY), jsonObject.getInt(SECOND_KEY), jsonObject.getInt(NANO_KEY));
+		if (LocalDate.class.equals(this.temporalAccessorClass) || LocalDateTime.class.equals(this.temporalAccessorClass)) {
+			// 年
+			final Integer year = jsonObject.getInt(YEAR_KEY);
+			Assert.notNull(year, "Field 'year' must be not null");
+
+			// 月
+			final String monthStr = jsonObject.getStr(MONTH_KEY);
+			Assert.notNull(monthStr, "Field 'month' must be not null");
+			Integer month = NumberUtil.parseInt(monthStr, null);
+			if (null == month) {
+				final Month monthEnum = Month.valueOf(monthStr);
+				month = monthEnum.getValue();
+			}
+
+			// 日
+			Integer day = jsonObject.getInt(DAY_KEY);
+			if (null == day) {
+				day = jsonObject.getInt("dayOfMonth");
+				Assert.notNull(day, "Field 'day' or 'dayOfMonth' must be not null");
+			}
+
+			final LocalDate localDate = LocalDate.of(year, month, day);
+			if (LocalDate.class.equals(this.temporalAccessorClass)) {
+				return localDate;
+			}
+
+			// 时分秒毫秒
+			final LocalTime localTime = LocalTime.of(
+				jsonObject.getInt(HOUR_KEY, 0),
+				jsonObject.getInt(MINUTE_KEY, 0),
+				jsonObject.getInt(SECOND_KEY, 0),
+				jsonObject.getInt(NANO_KEY, 0));
+
+			return LocalDateTime.of(localDate, localTime);
 		} else if (LocalTime.class.equals(this.temporalAccessorClass)) {
-			return LocalTime.of(jsonObject.getInt(HOUR_KEY), jsonObject.getInt(MINUTE_KEY), jsonObject.getInt(SECOND_KEY), jsonObject.getInt(NANO_KEY));
+			return LocalTime.of(
+				jsonObject.getInt(HOUR_KEY),
+				jsonObject.getInt(MINUTE_KEY),
+				jsonObject.getInt(SECOND_KEY),
+				jsonObject.getInt(NANO_KEY));
 		}
 
 		throw new JSONException("Unsupported type from JSON: {}", this.temporalAccessorClass);
diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/IssueI82AM8Test.java b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI82AM8Test.java
new file mode 100644
index 000000000..df6f3a6d3
--- /dev/null
+++ b/hutool-json/src/test/java/org/dromara/hutool/json/IssueI82AM8Test.java
@@ -0,0 +1,43 @@
+package org.dromara.hutool.json;
+
+import lombok.Data;
+import org.dromara.hutool.core.io.resource.ResourceUtil;
+import org.dromara.hutool.core.reflect.TypeReference;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+public class IssueI82AM8Test {
+
+	@Test
+	void toBeanTest() {
+		final String json = ResourceUtil.readUtf8Str("issueI82AM8.json");
+
+		final Map<String, MedicalCenter.MedicalCenterLocalized> bean1 =
+			JSONUtil.toBean(json, new TypeReference<Map<String, MedicalCenter.MedicalCenterLocalized>>() {});
+
+		//Console.log(bean1);
+		bean1.forEach((k, v) -> Assertions.assertNotNull(v.getTestimonials()));
+	}
+
+	// 对象
+	@Data
+	public static class MedicalCenter {
+
+		private Map<String, MedicalCenterLocalized> medicalCenterLocalized;
+
+		@Data
+		public static class MedicalCenterLocalized {
+
+			private List<Testimonial> testimonials;
+
+			@Data
+			public static class Testimonial {
+				private LocalDateTime createTime;
+			}
+		}
+	}
+}
diff --git a/hutool-json/src/test/resources/issueI82AM8.json b/hutool-json/src/test/resources/issueI82AM8.json
new file mode 100644
index 000000000..a12f9bde9
--- /dev/null
+++ b/hutool-json/src/test/resources/issueI82AM8.json
@@ -0,0 +1,46 @@
+{
+  "en": {
+    "testimonials": [
+      {
+        "createTime": {
+          "dayOfYear": 261,
+          "dayOfWeek": "MONDAY",
+          "year": 2023,
+          "month": "SEPTEMBER",
+          "nano": 0,
+          "monthValue": 9,
+          "dayOfMonth": 18,
+          "hour": 15,
+          "minute": 18,
+          "second": 0,
+          "chronology": {
+            "id": "ISO",
+            "calendarType": "iso8601"
+          }
+        }
+      }
+    ]
+  },
+  "zh": {
+    "testimonials": [
+      {
+        "createTime": {
+          "dayOfYear": 261,
+          "dayOfWeek": "MONDAY",
+          "year": 2023,
+          "month": "SEPTEMBER",
+          "nano": 0,
+          "monthValue": 9,
+          "dayOfMonth": 18,
+          "hour": 15,
+          "minute": 18,
+          "second": 0,
+          "chronology": {
+            "id": "ISO",
+            "calendarType": "iso8601"
+          }
+        }
+      }
+    ]
+  }
+}