新增临近节气；新增八字起运、大运、流年、小运、流月。

2025-12-25 06:47:59 +08:00 · 2020-08-31 09:42:55 +08:00
parent 4b8d195b03
commit aca6122d45
10 changed files with 1009 additions and 112 deletions
--- a/src/test/java/sample/BaZiTestNew.java
+++ b/src/test/java/sample/BaZiTestNew.java
@@ -1,60 +1,64 @@
 package sample;

+import com.nlf.calendar.EightChar;
 import com.nlf.calendar.Lunar;
 import com.nlf.calendar.Solar;
+import com.nlf.calendar.eightchar.*;
+import org.junit.Assert;
 import org.junit.Test;

 import java.util.List;

 /**
 * 八字测试
+ *
 * @author 6tail
 */
 public class BaZiTestNew {

  @Test
-  public void test1(){
-    Solar solar = new Solar(2020,1,1,22,35,0);
+  public void test1() {
+    Solar solar = new Solar(2020, 1, 1, 22, 35, 0);
    Lunar lunar = solar.getLunar();
    //己亥 丙子 癸卯 癸亥
    System.out.println(lunar.getEightChar());
  }

  @Test
-  public void test2(){
-    Solar solar = new Solar(2020,1,6,14,35,0);
+  public void test2() {
+    Solar solar = new Solar(2020, 1, 6, 14, 35, 0);
    Lunar lunar = solar.getLunar();
    //己亥, 丁丑, 戊申, 己未]
    System.out.println(lunar.getEightChar());
  }

  @Test
-  public void test3(){
-    Solar solar = new Solar(2020,1,6,3,35,0);
+  public void test3() {
+    Solar solar = new Solar(2020, 1, 6, 3, 35, 0);
    Lunar lunar = solar.getLunar();
    //己亥, 丁丑, 戊辰, 癸亥]
    System.out.println(lunar.getEightChar());
  }

  @Test
-  public void test4(){
-    Solar solar = new Solar(2020,1,26,21,41,0);
+  public void test4() {
+    Solar solar = new Solar(2020, 1, 26, 21, 41, 0);
    Lunar lunar = solar.getLunar();
    //己亥, 丙子, 戊申, 甲寅]
    System.out.println(lunar.getEightChar());
  }

  @Test
-  public void test5(){
-    Solar solar = new Solar(2020,2,4,1,42,0);
+  public void test5() {
+    Solar solar = new Solar(2020, 2, 4, 1, 42, 0);
    Lunar lunar = solar.getLunar();
    //己亥, 丁丑, 丁丑, 辛丑]
    System.out.println(lunar.getEightChar());
  }

  @Test
-  public void test6(){
-    Solar solar = new Solar(2020,2,5,21,43,0);
+  public void test6() {
+    Solar solar = new Solar(2020, 2, 5, 21, 43, 0);
    Lunar lunar = solar.getLunar();
    //庚子, 戊寅, 戊寅, 癸亥]
    System.out.println(lunar.getEightChar());
@@ -70,8 +74,8 @@ public class BaZiTestNew {
  }

  @Test
-  public void test7(){
-    Solar solar = new Solar(2020,5,26,23,43,0);
+  public void test7() {
+    Solar solar = new Solar(2020, 5, 26, 23, 43, 0);
    Lunar lunar = solar.getLunar();
    //庚子, 辛巳, 庚午, 丙子]
    System.out.println(lunar.getEightChar());
@@ -106,7 +110,7 @@ public class BaZiTestNew {

  @Test
  public void testBaziShiShenZhi() {
-    Solar solar = new Solar(2020,1,1,22,35,0);
+    Solar solar = new Solar(2020, 1, 1, 22, 35, 0);
    Lunar lunar = solar.getLunar();
    //己亥 丙子 癸卯 癸亥
    System.out.println(lunar.getEightChar());
@@ -129,4 +133,185 @@ public class BaZiTestNew {
    System.out.println(lunar.getEightChar().getTimeShiShenZhi());
  }

+  /**
+   * 起运
+   */
+  @Test
+  public void testQiYun() {
+    Solar solar = new Solar(1983, 2, 15, 20, 0, 0);
+    Lunar lunar = solar.getLunar();
+    EightChar bazi = lunar.getEightChar();
+    Yun yun = bazi.getYun(0);
+    Assert.assertEquals(6, yun.getStartYear());
+    Assert.assertEquals(2, yun.getStartMonth());
+    Assert.assertEquals(20, yun.getStartDay());
+    Assert.assertEquals("1989-05-05", yun.getStartSolar().toYmd());
+
+    solar = new Solar(2013, 7, 13, 16, 17, 0);
+    lunar = solar.getLunar();
+    bazi = lunar.getEightChar();
+    yun = bazi.getYun(0);
+    Assert.assertEquals(8, yun.getStartYear());
+    Assert.assertEquals(4, yun.getStartMonth());
+    Assert.assertEquals(0, yun.getStartDay());
+    Assert.assertEquals("2021-11-13", yun.getStartSolar().toYmd());
+
+    solar = new Solar(2020, 8, 18, 10, 0, 0);
+    lunar = solar.getLunar();
+    bazi = lunar.getEightChar();
+    yun = bazi.getYun(0);
+    Assert.assertEquals(3, yun.getStartYear());
+    Assert.assertEquals(8, yun.getStartMonth());
+    Assert.assertEquals(0, yun.getStartDay());
+    Assert.assertEquals("2024-04-18", yun.getStartSolar().toYmd());
+
+    solar = new Solar(1972, 6, 15, 0, 0, 0);
+    lunar = solar.getLunar();
+    bazi = lunar.getEightChar();
+    yun = bazi.getYun(1);
+    Assert.assertEquals(7, yun.getStartYear());
+    Assert.assertEquals(5, yun.getStartMonth());
+    Assert.assertEquals(10, yun.getStartDay());
+    Assert.assertEquals("1979-11-25", yun.getStartSolar().toYmd());
+
+    solar = new Solar(1968, 11, 22, 0, 0, 0);
+    lunar = solar.getLunar();
+    bazi = lunar.getEightChar();
+    yun = bazi.getYun(1);
+    Assert.assertEquals(5, yun.getStartYear());
+    Assert.assertEquals(1, yun.getStartMonth());
+    Assert.assertEquals(20, yun.getStartDay());
+    Assert.assertEquals("1974-01-11", yun.getStartSolar().toYmd());
+
+    solar = new Solar(1968, 11, 23, 0, 0, 0);
+    lunar = solar.getLunar();
+    bazi = lunar.getEightChar();
+    yun = bazi.getYun(1);
+    Assert.assertEquals(4, yun.getStartYear());
+    Assert.assertEquals(9, yun.getStartMonth());
+    Assert.assertEquals(20, yun.getStartDay());
+    Assert.assertEquals("1973-09-12", yun.getStartSolar().toYmd());
+  }
+
+  /**
+   * 大运
+   */
+  @Test
+  public void testDaYun() {
+    int[] startYears = {1983, 1989, 1999, 2009, 2019, 2029, 2039, 2049, 2059, 2069};
+    int[] endYears = {1988, 1998, 2008, 2018, 2028, 2038, 2048, 2058, 2068, 2078};
+    int[] startAges = {1, 7, 17, 27, 37, 47, 57, 67, 77, 87};
+    int[] endAges = {6, 16, 26, 36, 46, 56, 66, 76, 86, 96};
+    String[] yearGanZhi = {"", "乙卯", "丙辰", "丁巳", "戊午", "己未", "庚申", "辛酉", "壬戌", "癸亥"};
+    Solar solar = new Solar(1983, 2, 15, 20, 0, 0);
+    Lunar lunar = solar.getLunar();
+    EightChar bazi = lunar.getEightChar();
+    Yun yun = bazi.getYun(0);
+    DaYun[] l = yun.getDaYun();
+    for (int i = 0, j = l.length; i < j; i++) {
+      DaYun daYun = l[i];
+      Assert.assertEquals(startYears[i], daYun.getStartYear());
+      Assert.assertEquals(endYears[i], daYun.getEndYear());
+      Assert.assertEquals(startAges[i], daYun.getStartAge());
+      Assert.assertEquals(endAges[i], daYun.getEndAge());
+      Assert.assertEquals(yearGanZhi[i], daYun.getGanZhi());
+    }
+  }
+
+  /**
+   * 流年
+   */
+  @Test
+  public void testLiuNian() {
+    Solar solar = new Solar(1983, 2, 15, 20, 0, 0);
+    Lunar lunar = solar.getLunar();
+    EightChar bazi = lunar.getEightChar();
+    Yun yun = bazi.getYun(0);
+    DaYun[] daYun = yun.getDaYun();
+
+    int[] years = {1983, 1984, 1985, 1986, 1987, 1988};
+    int[] ages = {1, 2, 3, 4, 5, 6};
+    String[] ganZhi = {"癸亥", "甲子", "乙丑", "丙寅", "丁卯", "戊辰"};
+    LiuNian[] l = daYun[0].getLiuNian();
+    for (int i = 0, j = l.length; i < j; i++) {
+      LiuNian liuNian = l[i];
+      Assert.assertEquals(years[i], liuNian.getYear());
+      Assert.assertEquals(ages[i], liuNian.getAge());
+      Assert.assertEquals(ganZhi[i], liuNian.getGanZhi());
+    }
+
+    years = new int[]{2029, 2030, 2031, 2032, 2033, 2034, 2035, 2036, 2037, 2038};
+    ages = new int[]{47, 48, 49, 50, 51, 52, 53, 54, 55, 56};
+    ganZhi = new String[]{"己酉", "庚戌", "辛亥", "壬子", "癸丑", "甲寅", "乙卯", "丙辰", "丁巳", "戊午"};
+    l = daYun[5].getLiuNian();
+    for (int i = 0, j = l.length; i < j; i++) {
+      LiuNian liuNian = l[i];
+      Assert.assertEquals(years[i], liuNian.getYear());
+      Assert.assertEquals(ages[i], liuNian.getAge());
+      Assert.assertEquals(years[i] + "年", ganZhi[i], liuNian.getGanZhi());
+    }
+  }
+
+  /**
+   * 小运
+   */
+  @Test
+  public void testXiaoYun() {
+    Solar solar = new Solar(1983, 2, 15, 20, 0, 0);
+    Lunar lunar = solar.getLunar();
+    EightChar bazi = lunar.getEightChar();
+    Yun yun = bazi.getYun(0);
+    DaYun[] daYun = yun.getDaYun();
+
+    int[] years = {1983, 1984, 1985, 1986, 1987, 1988};
+    int[] ages = {1, 2, 3, 4, 5, 6};
+    String[] ganZhi = {"乙亥", "丙子", "丁丑", "戊寅", "己卯", "庚辰"};
+    XiaoYun[] l = daYun[0].getXiaoYun();
+    for (int i = 0, j = l.length; i < j; i++) {
+      XiaoYun xiaoYun = l[i];
+      Assert.assertEquals(years[i], xiaoYun.getYear());
+      Assert.assertEquals(ages[i], xiaoYun.getAge());
+      Assert.assertEquals(ganZhi[i], xiaoYun.getGanZhi());
+    }
+
+    years = new int[]{2029, 2030, 2031, 2032, 2033, 2034, 2035, 2036, 2037, 2038};
+    ages = new int[]{47, 48, 49, 50, 51, 52, 53, 54, 55, 56};
+    ganZhi = new String[]{"辛酉", "壬戌", "癸亥", "甲子", "乙丑", "丙寅", "丁卯", "戊辰", "己巳", "庚午"};
+    l = daYun[5].getXiaoYun();
+    for (int i = 0, j = l.length; i < j; i++) {
+      XiaoYun xiaoYun = l[i];
+      Assert.assertEquals(years[i], xiaoYun.getYear());
+      Assert.assertEquals(ages[i], xiaoYun.getAge());
+      Assert.assertEquals(years[i] + "年", ganZhi[i], xiaoYun.getGanZhi());
+    }
+  }
+
+  /**
+   * 流月
+   */
+  @Test
+  public void testLiuYue() {
+    Solar solar = new Solar(1983, 2, 15, 20, 0, 0);
+    Lunar lunar = solar.getLunar();
+    EightChar bazi = lunar.getEightChar();
+    Yun yun = bazi.getYun(0);
+    DaYun[] daYun = yun.getDaYun();
+
+    String[] ganZhi = {"甲寅", "乙卯", "丙辰", "丁巳", "戊午", "己未", "庚申", "辛酉", "壬戌", "癸亥", "甲子", "乙丑"};
+    LiuNian[] liuNian = daYun[0].getLiuNian();
+    LiuYue[] l = liuNian[0].getLiuYue();
+    for (int i = 0, j = l.length; i < j; i++) {
+      LiuYue liuYue = l[i];
+      Assert.assertEquals(ganZhi[i], liuYue.getGanZhi());
+    }
+
+    ganZhi = new String[]{"庚寅", "辛卯", "壬辰", "癸巳", "甲午", "乙未", "丙申", "丁酉", "戊戌", "己亥", "庚子", "辛丑"};
+    liuNian = daYun[4].getLiuNian();
+    l = liuNian[2].getLiuYue();
+    for (int i = 0, j = l.length; i < j; i++) {
+      LiuYue liuYue = l[i];
+      Assert.assertEquals(ganZhi[i], liuYue.getGanZhi());
+    }
+  }
+
 }