修复闰冬月、闰腊月的问题；修复日历不准的问题；修复物候错误；大运、小运、流年支持自定义轮数。

2026-04-09 01:48:41 +08:00 · 2021-09-13 15:41:49 +08:00
parent d26313d2e3
commit c93031cc28
10 changed files with 314 additions and 99 deletions
--- a/src/main/java/com/nlf/calendar/ExactDate.java
+++ b/src/main/java/com/nlf/calendar/ExactDate.java
@@ -2,6 +2,7 @@ package com.nlf.calendar;

 import java.util.Calendar;
 import java.util.Date;
+import java.util.TimeZone;

 /**
 * 精确日期
@@ -10,8 +11,13 @@ import java.util.Date;
 */
 public class ExactDate {

+  /**
+   * 时区
+   */
+  private static final TimeZone TIME_ZONE = TimeZone.getTimeZone("GMT+8");
+
  public static Calendar fromYmdHms(int year, int month, int day, int hour, int minute, int second) {
-    Calendar c = Calendar.getInstance();
+    Calendar c = Calendar.getInstance(TIME_ZONE);
    c.set(year, month - 1, day, hour, minute, second);
    c.set(Calendar.MILLISECOND, 0);
    return c;
@@ -22,7 +28,7 @@ public class ExactDate {
  }

  public static Calendar fromDate(Date date) {
-    Calendar c = Calendar.getInstance();
+    Calendar c = Calendar.getInstance(TIME_ZONE);
    c.setTime(date);
    c.set(Calendar.MILLISECOND, 0);
    return c;
--- a/src/main/java/com/nlf/calendar/Lunar.java
+++ b/src/main/java/com/nlf/calendar/Lunar.java
@@ -2590,6 +2590,6 @@ public class Lunar {
    Calendar startCalendar = ExactDate.fromYmd(startSolar.getYear(), startSolar.getMonth(), startSolar.getDay());

    int days = (int) ((currentCalendar.getTimeInMillis() - startCalendar.getTimeInMillis()) / MS_PER_DAY);
-    return LunarUtil.WU_HOU[offset * 3 + days / 5];
+    return LunarUtil.WU_HOU[(offset * 3 + days / 5) % LunarUtil.WU_HOU.length];
  }
 }
--- a/src/main/java/com/nlf/calendar/LunarYear.java
+++ b/src/main/java/com/nlf/calendar/LunarYear.java
@@ -3,7 +3,9 @@ package com.nlf.calendar;
 import com.nlf.calendar.util.ShouXingUtil;

 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;

 /**
 * 农历年
@@ -12,6 +14,26 @@ import java.util.List;
 */
 public class LunarYear {

+  /**
+   * 闰冬月年份
+   */
+  private static final int[] LEAP_11 = {75, 94, 170, 238, 265, 322, 389, 469, 553, 583, 610, 678, 735, 754, 773, 849, 887, 936, 1050, 1069, 1126, 1145, 1164, 1183, 1259, 1278, 1308, 1373, 1403, 1441, 1460, 1498, 1555, 1593, 1612, 1631, 1642, 2033, 2128, 2147, 2242, 2614, 2728, 2910, 3062, 3244, 3339, 3616, 3711, 3730, 3825, 4007, 4159, 4197, 4322, 4341, 4379, 4417, 4531, 4599, 4694, 4713, 4789, 4808, 4971, 5085, 5104, 5161, 5180, 5199, 5294, 5305, 5476, 5677, 5696, 5772, 5791, 5848, 5886, 6049, 6068, 6144, 6163, 6258, 6402, 6440, 6497, 6516, 6630, 6641, 6660, 6679, 6736, 6774, 6850, 6869, 6899, 6918, 6994, 7013, 7032, 7051, 7070, 7089, 7108, 7127, 7146, 7222, 7271, 7290, 7309, 7366, 7385, 7404, 7442, 7461, 7480, 7491, 7499, 7594, 7624, 7643, 7662, 7681, 7719, 7738, 7814, 7863, 7882, 7901, 7939, 7958, 7977, 7996, 8034, 8053, 8072, 8091, 8121, 8159, 8186, 8216, 8235, 8254, 8273, 8311, 8330, 8341, 8349, 8368, 8444, 8463, 8474, 8493, 8531, 8569, 8588, 8626, 8664, 8683, 8694, 8702, 8713, 8721, 8751, 8789, 8808, 8816, 8827, 8846, 8884, 8903, 8922, 8941, 8971, 9036, 9066, 9085, 9104, 9123, 9142, 9161, 9180, 9199, 9218, 9256, 9294, 9313, 9324, 9343, 9362, 9381, 9419, 9438, 9476, 9514, 9533, 9544, 9552, 9563, 9571, 9582, 9601, 9639, 9658, 9666, 9677, 9696, 9734, 9753, 9772, 9791, 9802, 9821, 9886, 9897, 9916, 9935, 9954, 9973, 9992};
+  /**
+   * 闰腊月年份
+   */
+  private static final int[] LEAP_12 = {37, 56, 113, 132, 151, 189, 208, 227, 246, 284, 303, 341, 360, 379, 417, 436, 458, 477, 496, 515, 534, 572, 591, 629, 648, 667, 697, 716, 792, 811, 830, 868, 906, 925, 944, 963, 982, 1001, 1020, 1039, 1058, 1088, 1153, 1202, 1221, 1240, 1297, 1335, 1392, 1411, 1422, 1430, 1517, 1525, 1536, 1574, 3358, 3472, 3806, 3988, 4751, 4941, 5066, 5123, 5275, 5343, 5438, 5457, 5495, 5533, 5552, 5715, 5810, 5829, 5905, 5924, 6421, 6535, 6793, 6812, 6888, 6907, 7002, 7184, 7260, 7279, 7374, 7556, 7746, 7757, 7776, 7833, 7852, 7871, 7966, 8015, 8110, 8129, 8148, 8224, 8243, 8338, 8406, 8425, 8482, 8501, 8520, 8558, 8596, 8607, 8615, 8645, 8740, 8778, 8835, 8865, 8930, 8960, 8979, 8998, 9017, 9055, 9074, 9093, 9112, 9150, 9188, 9237, 9275, 9332, 9351, 9370, 9408, 9427, 9446, 9457, 9465, 9495, 9560, 9590, 9628, 9647, 9685, 9715, 9742, 9780, 9810, 9818, 9829, 9848, 9867, 9905, 9924, 9943, 9962, 10000};
+
+  private static final Map<Integer, Integer> LEAP = new HashMap<Integer, Integer>();
+
+  static {
+    for (int y : LEAP_11) {
+      LEAP.put(y, 13);
+    }
+    for (int y : LEAP_12) {
+      LEAP.put(y, 14);
+    }
+  }
+
  /**
   * 农历年
   */
@@ -55,7 +77,9 @@ public class LunarYear {
    // 每月天数
    int[] dayCounts = new int[hs.length - 1];

-    int year = this.year - 2000;
+    int currentYear = this.year;
+
+    int year = currentYear - 2000;
    // 从上年的大雪到下年的立春
    for (int i = 0, j = Lunar.JIE_QI_IN_USE.length; i < j; i++) {
      // 精确的节气
@@ -82,25 +106,41 @@ public class LunarYear {
      dayCounts[i] = (int) (hs[i + 1] - hs[i]);
    }

-    int leap = -1;
-    if (hs[13] <= jq[24]) {
-      int i = 1;
-      while (hs[i + 1] > jq[2 * i] && i < 13) {
-        i++;
+    Integer currentYearLeap = LEAP.get(currentYear);
+    if (null == currentYearLeap) {
+      currentYearLeap = -1;
+      if (hs[13] <= jq[24]) {
+        int i = 1;
+        while (hs[i + 1] > jq[2 * i] && i < 13) {
+          i++;
+        }
+        currentYearLeap = i;
      }
-      leap = i;
    }

-    int y = this.year - 1;
+    int prevYear = currentYear - 1;
+    Integer prevYearLeap = LEAP.get(prevYear);
+    prevYearLeap = null == prevYearLeap ? -1 : prevYearLeap - 12;
+
+    int y = prevYear;
    int m = 11;
    for (int i = 0, j = dayCounts.length; i < j; i++) {
-      boolean isLeap = false;
-      if (i == leap) {
-        isLeap = true;
-        m--;
+      int cm = m;
+      boolean isNextLeap = false;
+      if (y == currentYear && i == currentYearLeap) {
+        cm = -cm;
+      } else if (y == prevYear && i == prevYearLeap) {
+        cm = -cm;
+      }
+      if (y == currentYear && i + 1 == currentYearLeap) {
+        isNextLeap = true;
+      } else if (y == prevYear && i + 1 == prevYearLeap) {
+        isNextLeap = true;
+      }
+      this.months.add(new LunarMonth(y, cm, dayCounts[i], hs[i] + Solar.J2000));
+      if (!isNextLeap) {
+        m++;
      }
-      this.months.add(new LunarMonth(y, isLeap ? -m : m, dayCounts[i], hs[i] + Solar.J2000));
-      m++;
      if (m == 13) {
        m = 1;
        y++;
--- a/src/main/java/com/nlf/calendar/eightchar/DaYun.java
+++ b/src/main/java/com/nlf/calendar/eightchar/DaYun.java
@@ -117,12 +117,21 @@ public class DaYun {
  }

  /**
-   * 获取流年
+   * 获取10轮流年
   *
   * @return 流年
   */
  public LiuNian[] getLiuNian() {
-    int n = 10;
+    return getLiuNian(10);
+  }
+
+  /**
+   * 获取流年
+   *
+   * @param n 轮数
+   * @return 流年
+   */
+  public LiuNian[] getLiuNian(int n) {
    if (index < 1) {
      n = endYear-startYear+1;
    }
@@ -134,12 +143,20 @@ public class DaYun {
  }

  /**
-   * 获取小运
+   * 获取10轮小运
   *
   * @return 小运
   */
  public XiaoYun[] getXiaoYun() {
-    int n = 10;
+    return getXiaoYun(10);
+  }
+
+  /**
+   * 获取小运
+   * @param n 轮数
+   * @return 小运
+   */
+  public XiaoYun[] getXiaoYun(int n) {
    if (index < 1) {
      n = endYear-startYear+1;
    }
--- a/src/main/java/com/nlf/calendar/eightchar/Yun.java
+++ b/src/main/java/com/nlf/calendar/eightchar/Yun.java
@@ -145,12 +145,21 @@ public class Yun {
  }

  /**
-   * 获取大运
+   * 获取10轮大运
   *
   * @return 大运
   */
  public DaYun[] getDaYun() {
-    int n = 10;
+    return getDaYun(10);
+  }
+
+  /**
+   * 获取大运
+   *
+   * @param n 轮数
+   * @return 大运
+   */
+  public DaYun[] getDaYun(int n) {
    DaYun[] l = new DaYun[n];
    for (int i = 0; i < n; i++) {
      l[i] = new DaYun(this, i);
--- a/src/main/java/com/nlf/calendar/util/HolidayUtil.java
+++ b/src/main/java/com/nlf/calendar/util/HolidayUtil.java
@@ -7,7 +7,7 @@ import java.util.Collections;
 import java.util.List;

 /**
- * 法定节假日工具（默认自2001年12月29日起，至2020年12月31日止）
+ * 法定节假日工具（默认自2001年12月29日起）
 *
 * @author 6tail
 */