lxm_library_java/lunar-java
1
0
Fork 0
mirror of synced 2026-10-17 03:56:11 +08:00
Code Issues Projects Releases Wiki Activity

v1.7.3 修复个别日太岁方位的错误；修复八字身宫计算错误的问题。

Browse Source
This commit is contained in:
6tail
2025-04-07 19:05:18 +08:00
parent 264481532b
commit 9a302e2a1a
7 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/nlf/calendar/EightChar.java
View File

@@ -527,15 +527,12 @@ public class EightChar {
public String getShenGong() {
int monthZhiIndex = LunarUtil.find(getMonthZhi(), MONTH_ZHI, 0);
int timeZhiIndex = LunarUtil.find(getTimeZhi(), LunarUtil.ZHI, 0);
int offset = monthZhiIndex + timeZhiIndex;
while (offset > 12) {
offset -= 12;
}
int ganIndex = (lunar.getYearGanIndexExact() + 1) * 2 + (offset % 12);
int offset = (monthZhiIndex + timeZhiIndex - 1) % 12;
int ganIndex = (lunar.getYearGanIndexExact() + 1) * 2 + offset;
while (ganIndex > 10) {
ganIndex -= 10;
}
return LunarUtil.GAN[ganIndex] + MONTH_ZHI[offset];
return LunarUtil.GAN[ganIndex + 1] + MONTH_ZHI[offset + 1];
}
/**

6
src/main/java/com/nlf/calendar/Lunar.java
View File

@@ -1347,11 +1347,11 @@ public class Lunar {
protected String getDayPositionTaiSui(String dayInGanZhi, int yearZhiIndex) {
String p;
if ("甲子,乙丑,丙寅,丁卯,戊辰,已巳".contains(dayInGanZhi)) {
if ("甲子,乙丑,丙寅,丁卯,戊辰,己巳".contains(dayInGanZhi)) {
p = "震";
} else if ("丙子,丁丑,戊寅,已卯,庚辰,辛巳".contains(dayInGanZhi)) {
} else if ("丙子,丁丑,戊寅,己卯,庚辰,辛巳".contains(dayInGanZhi)) {
p = "离";
} else if ("戊子,已丑,庚寅,辛卯,壬辰,癸巳".contains(dayInGanZhi)) {
} else if ("戊子,己丑,庚寅,辛卯,壬辰,癸巳".contains(dayInGanZhi)) {
p = "中";
} else if ("庚子,辛丑,壬寅,癸卯,甲辰,乙巳".contains(dayInGanZhi)) {
p = "兑";