diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ShiChen.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ShiChen.java index 79f58d334..a94584dc0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ShiChen.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ShiChen.java @@ -1,6 +1,7 @@ package org.dromara.hutool.core.date.chinese; import org.dromara.hutool.core.date.DateBetween; +import org.dromara.hutool.core.text.StrUtil; import java.time.LocalDateTime; import java.time.ZoneId; @@ -9,67 +10,80 @@ import java.util.HashMap; import java.util.Map; /** - * 时辰转换器 + * 时辰转换器，支持宋以后的二十四时辰制度。 *

- * 23-1 -> 子时 - * 1-3 -> 丑时 - * 3-5 -> 寅时 - * 5-7 -> 卯时 - * 7-9 -> 辰时 - * 9-11 -> 巳时 - * 11-13 -> 午时 - * 13-15 -> 未时 - * 15-17 -> 申时 - * 17-19 -> 酉时 - * 19-21 -> 戌时 - * 21-23 -> 亥时 - * 24/-1/其他值 -> 未知 - *

+ * 该转换器能够处理包含“时”、“初”或“正”后缀的长安时辰描述，并根据这些描述自动返回相应的现代时间段。 + * 对于“初”和“正”的描述，分别对应每个时辰的前半段和后半段，而不带后缀的时辰描述则表示该时辰的整个时间段。 + *

+ *

+ * 此外，该转换器还提供了根据小时数转换为对应的长安时辰描述的功能，通过isAbs参数可以控制返回的描述是否包含“初”或“正”。 + *

+ *

+ * 示例： + *

+ *

* @author achao@hutool.cn */ public class ShiChen { - private static final Map timeMap = new HashMap<>(); + private static final Map timeMap = new HashMap<>(); + private static final Map fullTimeMap = new HashMap<>(); + private static final Map hourToShiChenMap = new HashMap<>(); + private static final Map hourToShiChenAbsMap = new HashMap<>(); static { // 初始化时辰对应的小时范围 - timeMap.put("子", new int[]{23, 1}); - timeMap.put("丑", new int[]{1, 3}); - timeMap.put("寅", new int[]{3, 5}); - timeMap.put("卯", new int[]{5, 7}); - timeMap.put("辰", new int[]{7, 9}); - timeMap.put("巳", new int[]{9, 11}); - timeMap.put("午", new int[]{11, 13}); - timeMap.put("未", new int[]{13, 15}); - timeMap.put("申", new int[]{15, 17}); - timeMap.put("酉", new int[]{17, 19}); - timeMap.put("戌", new int[]{19, 21}); - timeMap.put("亥", new int[]{21, 23}); + String[] times = {"子", "丑", "寅", "卯", "辰", "巳", "午", "未", "申", "酉", "戌", "亥"}; + int hour = 23; + for (String time : times) { + timeMap.put(time + "初", hour % 24); + timeMap.put(time + "正", (hour + 1) % 24); + fullTimeMap.put(time, new Integer[]{hour % 24, (hour + 2) % 24}); + hour += 2; + } + + // 初始化小时到时辰的映射 + hour = 23; + for (String time : times) { + hourToShiChenMap.put(hour % 24, time + "初"); + hourToShiChenMap.put((hour + 1) % 24, time + "正"); + hourToShiChenAbsMap.put(hour % 24, time + "时"); + hourToShiChenAbsMap.put((hour + 1) % 24, time + "时"); + hour += 2; + } } - /** - * 将长安时辰转换为现代时间 - *

- * toModernTime("子时").getBegin().getHours() -> 23 - * toModernTime("子时").getEnd().getHours() -> 1 - *

- * - * @param changAnTime 长安时辰 - * @return 现代时间段 - */ - public static DateBetween toModernTime(String changAnTime) { - String time = changAnTime.replace("时", ""); - int[] hours = timeMap.get(time); - if (hours == null) { - throw new IllegalArgumentException("Invalid ChangAn time"); + public static DateBetween toModernTime(String shiChen) { + if (StrUtil.isEmpty(shiChen)) { + throw new IllegalArgumentException("Invalid shiChen"); + } + Integer startHour, endHour; + LocalDateTime start, end; + + if (shiChen.endsWith("初") || shiChen.endsWith("正")) { + startHour = timeMap.get(shiChen); + if (startHour == null) { + throw new IllegalArgumentException("Invalid ChangAn time"); + } + endHour = (startHour + 1) % 24; + } else { + String baseTime = shiChen.replace("时", ""); + Integer[] hours = fullTimeMap.get(baseTime); + if (hours == null) { + throw new IllegalArgumentException("Invalid ChangAn time"); + } + startHour = hours[0]; + endHour = hours[1]; } - LocalDateTime now = LocalDateTime.now(); - LocalDateTime start = now.withHour(hours[0]).withMinute(0).withSecond(0).withNano(0); - LocalDateTime end = now.withHour(hours[1]).withMinute(0).withSecond(0).withNano(0); - if (hours[0] >= hours[1]) { - end = end.plusDays(1); // 处理跨日情况 - } + start = LocalDateTime.now().withHour(startHour).withMinute(0).withSecond(0).withNano(0); + end = (startHour > endHour) ? start.plusDays(1).withHour(endHour) : start.withHour(endHour); Date startDate = Date.from(start.atZone(ZoneId.systemDefault()).toInstant()); Date endDate = Date.from(end.atZone(ZoneId.systemDefault()).toInstant()); @@ -77,23 +91,12 @@ public class ShiChen { return DateBetween.of(startDate, endDate); } - /** - * 将小时转换为长安时辰 - *

- * toChangAnTime(1) -> "子时" - *

- * @param hour 小时 - * @return 长安时辰 - */ - public static String toChangAnTime(int hour) { - for (Map.Entry entry : timeMap.entrySet()) { - int startHour = entry.getValue()[0]; - int endHour = entry.getValue()[1]; - if (hour == 23 || hour == 0 || (hour >= startHour && hour < endHour) || (startHour > endHour && hour < endHour)) { - return entry.getKey() + "时"; - } + public static String toShiChen(int hour, boolean isAbs) { + String result = hourToShiChenAbsMap.getOrDefault(hour, "未知"); + if (!isAbs && !result.equals("未知")) { + result = hourToShiChenMap.get(hour); } - return "未知"; + return result; } } diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/ShiChenTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/ShiChenTest.java index ebff657dd..ebc723b20 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/ShiChenTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/date/chinese/ShiChenTest.java @@ -1,6 +1,5 @@ package org.dromara.hutool.core.date.chinese; -import org.dromara.hutool.core.date.DateBetween; import org.dromara.hutool.core.date.DateUnit; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -13,27 +12,48 @@ import org.junit.jupiter.api.Test; public class ShiChenTest { @Test - void testToModernTimeForAllTimes() { - // 测试每个时辰的转换 + void testToModernTime() { + // 测试“时”后缀的转换，表示整个时辰 + Assertions.assertEquals(2, ShiChen.toModernTime("子时").between(DateUnit.HOUR)); + + // 测试“初”和“正”后缀的转换，表示时辰的前半段和后半段 + Assertions.assertEquals(1, ShiChen.toModernTime("子初").between(DateUnit.HOUR)); + Assertions.assertEquals(1, ShiChen.toModernTime("子正").between(DateUnit.HOUR)); + + // 测试所有时辰 String[] times = {"子", "丑", "寅", "卯", "辰", "巳", "午", "未", "申", "酉", "戌", "亥"}; - int[][] expectedHours = {{23, 1}, {1, 3}, {3, 5}, {5, 7}, {7, 9}, {9, 11}, {11, 13}, {13, 15}, {15, 17}, {17, 19}, {19, 21}, {21, 23}}; - for (int i = 0; i < times.length; i++) { - DateBetween dateBetween = ShiChen.toModernTime(times[i] + "时"); - Assertions.assertEquals(2, dateBetween.between(DateUnit.HOUR)); - Assertions.assertEquals(expectedHours[i][0], dateBetween.getBegin().getHours()); - Assertions.assertEquals(expectedHours[i][1], dateBetween.getEnd().getHours()); + for (String time : times) { + Assertions.assertEquals(2, ShiChen.toModernTime(time + "时").between(DateUnit.HOUR)); + Assertions.assertEquals(1, ShiChen.toModernTime(time + "初").between(DateUnit.HOUR)); + Assertions.assertEquals(1, ShiChen.toModernTime(time + "正").between(DateUnit.HOUR)); } + Assertions.assertThrows(IllegalArgumentException.class, () -> { + ShiChen.toModernTime("无效时"); + }); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + ShiChen.toModernTime("无效正"); + }); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + ShiChen.toModernTime(""); + }); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + ShiChen.toModernTime(null); + }); } @Test - void testToChangAnTimeForAllHours() { - // 从23时开始测试，因为子时开始于23时 - String[] expectedTimes = {"子时", "丑时", "丑时", "寅时", "寅时", "卯时", "卯时", "辰时", "辰时", "巳时", "巳时", "午时", "午时", "未时", "未时", "申时", "申时", "酉时", "酉时", "戌时", "戌时", "亥时", "亥时", "子时", "未知"}; - for (int hour = 0; hour <= 24; hour++) { - String expectedTime = expectedTimes[hour]; - String actualTime = ShiChen.toChangAnTime(hour); - Assertions.assertEquals(expectedTime, actualTime); - } + void testToShiChen() { + // 测试小时转换为长安时辰，不包含“初”或“正” + Assertions.assertEquals("子时", ShiChen.toShiChen(23, true)); + Assertions.assertEquals("子时", ShiChen.toShiChen(0, true)); + + // 测试小时转换为长安时辰，包含“初”或“正” + Assertions.assertEquals("子正", ShiChen.toShiChen(0, false)); + Assertions.assertEquals("丑初", ShiChen.toShiChen(1, false)); + + // 测试边界条件 + Assertions.assertEquals("未知", ShiChen.toShiChen(24, true)); + Assertions.assertEquals("未知", ShiChen.toShiChen(-1, false)); } }