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 MONTH_ZHI_TIAN_SHEN_OFFSET = new HashMap(){ + 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 TIAN_SHEN_TYPE = new HashMap(){ + private static final long serialVersionUID = -1L; + { + put("青龙","黄道"); + put("明堂","黄道"); + put("金贵","黄道"); + put("天德","黄道"); + put("玉堂","黄道"); + put("司命","黄道"); + + put("天刑","黑道"); + put("朱雀","黄道"); + put("白虎","黄道"); + put("天牢","黄道"); + put("玄武","黄道"); + put("勾陈","黄道"); + } + }; + /** 天神类型吉凶 */ + public static final Map TIAN_SHEN_TYPE_LUCK = new HashMap(){ + private static final long serialVersionUID = -1L; + { + put("黄道","吉"); + put("黑道","凶"); + } + }; /** 彭祖百忌.天干 */ public static final String[] PENGZU_GAN = {"","甲不开仓财物耗散","乙不栽植千株不长","丙不修灶必见灾殃","丁不剃头头必生疮","戊不受田田主不祥","己不破券二比并亡","庚不经络织机虚张","辛不合酱主人不尝","壬不泱水更难提防","癸不词讼理弱敌强"}; /** 彭祖百忌.地支 */