From 28b9add0e75410deb1430aa0eee85f2fec8262f7 Mon Sep 17 00:00:00 2001
From: 6tail <6tail@6tail.cn>
Date: Wed, 8 Apr 2020 23:58:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BB=BA=E9=99=A4=E5=8D=81?=
 =?UTF-8?q?=E4=BA=8C=E5=80=BC=E6=98=9F=EF=BC=9B=E5=A2=9E=E5=8A=A0=E9=9D=92?=
 =?UTF-8?q?=E9=BE=99=E3=80=81=E6=98=8E=E5=A0=82=E5=8D=81=E4=BA=8C=E5=A4=A9?=
 =?UTF-8?q?=E7=A5=9E=EF=BC=9B=E5=A2=9E=E5=8A=A0=E9=BB=84=E9=81=93=E3=80=81?=
 =?UTF-8?q?=E9=BB=91=E9=81=93=E6=97=A5=E5=8F=8A=E5=90=89=E5=87=B6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nlf/calendar/Lunar.java     | 42 +++++++++++++--
 .../java/com/nlf/calendar/util/LunarUtil.java | 51 ++++++++++++++++++-
 2 files changed, 87 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nlf/calendar/Lunar.java b/src/main/java/com/nlf/calendar/Lunar.java
index c79d88e..de6f623 100644
--- a/src/main/java/com/nlf/calendar/Lunar.java
+++ b/src/main/java/com/nlf/calendar/Lunar.java
@@ -880,10 +880,10 @@ public class Lunar{
   }
 
   /**
-   * 获取建除十二神，当月支与日支相同即为建，依次类推
-   * @return 十二神
+   * 获取十二执星：建、除、满、平、定、执、破、危、成、收、开、闭。当月支与日支相同即为建，依次类推
+   * @return 执星
    */
-  public String getShiErShen(){
+  public String getZhiXing(){
     String monthZhi = getMonthZhi();
     String dayZhi = getDayZhi();
     int indexMonthZhi = 0;
@@ -904,7 +904,41 @@ public class Lunar{
     if(add<0){
       add = 12+add;
     }
-    return LunarUtil.SHI_ER_SHEN[1+add];
+    return LunarUtil.ZHI_XING[1+add];
+  }
+
+  /**
+   * 获取值日天神
+   * @return 值日天神
+   */
+  public String getDayTianShen(){
+    String monthZhi = getMonthZhi();
+    String dayZhi = getDayZhi();
+    int offset = LunarUtil.MONTH_ZHI_TIAN_SHEN_OFFSET.get(monthZhi);
+    int dayIndex = 0;
+    for(int i=0,j=LunarUtil.ZHI.length;i<j;i++){
+      if(LunarUtil.ZHI[i].equals(dayZhi)){
+        dayIndex = i;
+        break;
+      }
+    }
+    return LunarUtil.TIAN_SHEN[1+(dayIndex-1+offset)%12];
+  }
+
+  /**
+   * 获取值日天神类型：黄道/黑道
+   * @return 值日天神类型：黄道/黑道
+   */
+  public String getDayTianShenType(){
+    return LunarUtil.TIAN_SHEN_TYPE.get(getDayTianShen());
+  }
+
+  /**
+   * 获取值日天神吉凶
+   * @return 吉/凶
+   */
+  public String getDayTianShenLuck(){
+    return LunarUtil.TIAN_SHEN_TYPE_LUCK.get(getDayTianShenType());
   }
 
   public String toFullString(){
diff --git a/src/main/java/com/nlf/calendar/util/LunarUtil.java b/src/main/java/com/nlf/calendar/util/LunarUtil.java
index c627fc1..8dd9dec 100644
--- a/src/main/java/com/nlf/calendar/util/LunarUtil.java
+++ b/src/main/java/com/nlf/calendar/util/LunarUtil.java
@@ -47,8 +47,55 @@ public class LunarUtil{
   public static final String[] POSITION_CAI = {"","艮","艮","坤","坤","坎","坎","震","震","离","离"};
   /** 地支 */
   public static final String[] ZHI = {"","子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"};
-  /** 建除十二神 */
-  public static final String[] SHI_ER_SHEN = {"","建","除","满","平","定","执","破","危","成","收","开","闭"};
+  /** 十二值星 */
+  public static final String[] ZHI_XING = {"","建","除","满","平","定","执","破","危","成","收","开","闭"};
+  /** 十二天神 */
+  public static final String[] TIAN_SHEN = {"","青龙","明堂","天刑","朱雀","金匮","天德","白虎","玉堂","天牢","玄武","司命","勾陈"};
+  /** 月份地支对应天神偏移下标 */
+  public static final Map<String,Integer> MONTH_ZHI_TIAN_SHEN_OFFSET = new HashMap<String, Integer>(){
+    private static final long serialVersionUID = -1L;
+    {
+      put("子",4);
+      put("丑",2);
+      put("寅",0);
+      put("卯",10);
+      put("辰",8);
+      put("巳",6);
+      put("午",4);
+      put("未",2);
+      put("申",0);
+      put("酉",10);
+      put("戌",8);
+      put("亥",6);
+    }
+  };
+  /** 天神类型：黄道，黑道 */
+  public static final Map<String,String> TIAN_SHEN_TYPE = new HashMap<String, String>(){
+    private static final long serialVersionUID = -1L;
+    {
+      put("青龙","黄道");
+      put("明堂","黄道");
+      put("金贵","黄道");
+      put("天德","黄道");
+      put("玉堂","黄道");
+      put("司命","黄道");
+
+      put("天刑","黑道");
+      put("朱雀","黄道");
+      put("白虎","黄道");
+      put("天牢","黄道");
+      put("玄武","黄道");
+      put("勾陈","黄道");
+    }
+  };
+  /** 天神类型吉凶 */
+  public static final Map<String,String> TIAN_SHEN_TYPE_LUCK = new HashMap<String, String>(){
+    private static final long serialVersionUID = -1L;
+    {
+      put("黄道","吉");
+      put("黑道","凶");
+    }
+  };
   /** 彭祖百忌.天干 */
   public static final String[] PENGZU_GAN = {"","甲不开仓财物耗散","乙不栽植千株不长","丙不修灶必见灾殃","丁不剃头头必生疮","戊不受田田主不祥","己不破券二比并亡","庚不经络织机虚张","辛不合酱主人不尝","壬不泱水更难提防","癸不词讼理弱敌强"};
   /** 彭祖百忌.地支 */