diff --git a/src/main/java/com/nlf/calendar/Lunar.java b/src/main/java/com/nlf/calendar/Lunar.java index de1eb8a..c3014dd 100644 --- a/src/main/java/com/nlf/calendar/Lunar.java +++ b/src/main/java/com/nlf/calendar/Lunar.java @@ -1828,21 +1828,41 @@ public class Lunar { } /** - * 获取每日宜,如果没有,返回["无"] + * 使用默认流派1(以节交接当天起算月)获取每日宜,如果没有,返回["无"] * * @return 宜 */ public List getDayYi() { - return LunarUtil.getDayYi(getMonthInGanZhiExact(), getDayInGanZhi()); + return getDayYi(1); + } + + /** + * 获取每日宜,如果没有,返回["无"] + * + * @param sect 流派,1以节交接当天起算月,2以节交接时刻起算月 + * @return 宜 + */ + public List getDayYi(int sect) { + return LunarUtil.getDayYi(2 == sect ? getMonthInGanZhiExact() : getMonthInGanZhi(), getDayInGanZhi()); + } + + /** + * 使用默认流派1(以节交接当天起算月)获取每日忌,如果没有,返回["无"] + * + * @return 忌 + */ + public List getDayJi() { + return getDayJi(1); } /** * 获取每日忌,如果没有,返回["无"] * + * @param sect 流派,1以节交接当天起算月,2以节交接时刻起算月 * @return 忌 */ - public List getDayJi() { - return LunarUtil.getDayJi(getMonthInGanZhiExact(), getDayInGanZhi()); + public List getDayJi(int sect) { + return LunarUtil.getDayJi(2 == sect ? getMonthInGanZhiExact() : getMonthInGanZhi(), getDayInGanZhi()); } /** diff --git a/src/test/java/test/LunarTest.java b/src/test/java/test/LunarTest.java index 1f90405..5fbb931 100644 --- a/src/test/java/test/LunarTest.java +++ b/src/test/java/test/LunarTest.java @@ -415,4 +415,12 @@ public class LunarTest { Assert.assertEquals("一九八六年七月初九", lunar.toString()); } + @Test + public void test56() { + Solar solar = new Solar(2022, 4, 5); + Lunar lunar = solar.getLunar(); + Assert.assertEquals("甲辰", lunar.getMonthInGanZhi()); + Assert.assertEquals(4, lunar.getDayJi().size()); + } + }