From 4085d8d05184ec29b2457f1fdd758b5685eb52e8 Mon Sep 17 00:00:00 2001 From: Looly Date: Wed, 24 Apr 2024 13:51:15 +0800 Subject: [PATCH] fix code --- .../dromara/hutool/core/date/chinese/LunarFestival.java | 4 +++- .../org/dromara/hutool/core/date/chinese/SolarTerms.java | 8 ++++---- .../dromara/hutool/core/date/chinese/package-info.java | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/LunarFestival.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/LunarFestival.java index 25478992e..75db701dd 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/LunarFestival.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/LunarFestival.java @@ -19,7 +19,8 @@ import java.util.List; import java.util.Map; /** - * 节假日(农历)封装 + * 节假日(农历)封装
+ * 由于 * * @author looly * @since 5.4.1 @@ -112,6 +113,7 @@ public class LunarFestival { day++; } } + return getFestivals(month, day); } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/SolarTerms.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/SolarTerms.java index cafcfbb70..03ab7d4ed 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/SolarTerms.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/SolarTerms.java @@ -189,11 +189,11 @@ public class SolarTerms { * 根据年月日获取节气, 内部方法,不对月和日做有效校验 * * @param year 公历年 - * @param mouth 公历月,从1开始 + * @param month 公历月,从1开始 * @param day 公历日,从1开始 * @return 返回指定年月日所处的节气,若不是一个节气则返回空字符串 */ - private static String getTermInternal(final int year, final int mouth, final int day) { + private static String getTermInternal(final int year, final int month, final int day) { if (year < 1900 || year > 2100) { throw new IllegalArgumentException("只支持1900-2100之间的日期获取节气"); } @@ -201,7 +201,7 @@ public class SolarTerms { final String termTable = S_TERM_INFO[year - 1900]; // 节气速查表中每5个字符含有4个节气,通过月份直接计算偏移 - final int segment = (mouth + 1) / 2 - 1; + final int segment = (month + 1) / 2 - 1; final int termInfo = Integer.parseInt(termTable.substring(segment * 5, (segment + 1) * 5), 16); final String termInfoStr = String.valueOf(termInfo); @@ -212,7 +212,7 @@ public class SolarTerms { segmentTable[3] = termInfoStr.substring(4, 6); // 奇数月份的节气在前2个,偶数月份的节气在后两个 - final int segmentOffset = (mouth & 1) == 1 ? 0 : 2; + final int segmentOffset = (month & 1) == 1 ? 0 : 2; if (day == Integer.parseInt(segmentTable[segmentOffset])) { return TERMS[segment * 4 + segmentOffset]; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/package-info.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/package-info.java index 74c03a7a5..ded945155 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/package-info.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/package-info.java @@ -11,7 +11,8 @@ */ /** - * 农历相关类汇总,包括农历月、天干地支、农历节日、24节气等 + * 农历相关类汇总,包括农历月、天干地支、农历节日、24节气等
+ * 规范参考:GB/T 33661-2017 * * @author looly *