|
@@ -1943,7 +1943,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if(fuqiGongBiCount>=3) {
|
|
|
+ if (fuqiGongBiCount >= 3) {
|
|
|
qiangGanContent.append("男命夫妻宫周围过多的比劫,可能出现夫妻感情不和睦的情况。");
|
|
|
}
|
|
|
|
|
@@ -2026,7 +2026,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if(fuqiGongShangCount>=3) {
|
|
|
+ if (fuqiGongShangCount >= 3) {
|
|
|
qiangGanContent.append("女命夫妻宫周围过多的伤官,可能出现夫妻感情不和睦的情况。");
|
|
|
}
|
|
|
|
|
@@ -2038,13 +2038,13 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
|
|
|
if (shiShenConfig.getTaoHuaZi().contains(ganZhiRowVoList.get(1).getName())) {
|
|
|
taoHuaZiCount++;
|
|
|
}
|
|
|
- if (shiShenConfig.getTaoHuaZi().contains(ganZhiRowVoList.get(2).getName())) {
|
|
|
+ if (shiShenConfig.getTaoHuaZi().contains(ganZhiRowVoList.get(3).getName())) {
|
|
|
taoHuaZiCount++;
|
|
|
}
|
|
|
- if (shiShenConfig.getTaoHuaZi().contains(ganZhiRowVoList.get(3).getName())) {
|
|
|
+ if (shiShenConfig.getTaoHuaZi().contains(ganZhiRowVoList.get(5).getName())) {
|
|
|
taoHuaZiCount++;
|
|
|
}
|
|
|
- if (shiShenConfig.getTaoHuaZi().contains(ganZhiRowVoList.get(4).getName())) {
|
|
|
+ if (shiShenConfig.getTaoHuaZi().contains(ganZhiRowVoList.get(7).getName())) {
|
|
|
taoHuaZiCount++;
|
|
|
}
|
|
|
|
|
@@ -2073,13 +2073,13 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
|
|
|
qiangGanContent.append("夫妻宫坐了食神,比较喜欢性爱之事。");
|
|
|
}
|
|
|
|
|
|
- if (dayGanShiShen1 != null && (dayGanShiShen1.contains("正印") || dayGanShiShen1.contains("偏印"))) {
|
|
|
+ if (dayGanShiShen1 != null && (dayGanShiShen1.contains("正印") || dayGanShiShen1.contains("偏印"))) {
|
|
|
qiangGanContent.append("夫妻宫坐了印,性欲有被克制之相,会性较冷淡。");
|
|
|
}
|
|
|
- if (dayGanShiShen2 != null && (dayGanShiShen2.contains("正印") || dayGanShiShen2.contains("偏印"))) {
|
|
|
+ if (dayGanShiShen2 != null && (dayGanShiShen2.contains("正印") || dayGanShiShen2.contains("偏印"))) {
|
|
|
qiangGanContent.append("夫妻宫坐了印,性欲有被克制之相,会性较冷淡。");
|
|
|
}
|
|
|
- if (dayGanShiShen3 != null && (dayGanShiShen3.contains("正印") || dayGanShiShen3.contains("偏印"))) {
|
|
|
+ if (dayGanShiShen3 != null && (dayGanShiShen3.contains("正印") || dayGanShiShen3.contains("偏印"))) {
|
|
|
qiangGanContent.append("夫妻宫坐了印,性欲有被克制之相,会性较冷淡。");
|
|
|
}
|
|
|
|
|
@@ -2100,16 +2100,92 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
|
|
|
//水主肾
|
|
|
int shuiCount = fiveCountMap.get("水");
|
|
|
|
|
|
- if(shuiCount>=4) {
|
|
|
+ if (shuiCount >= 4) {
|
|
|
qiangGanContent.append("八字中水主肾,水过旺,喜性爱,需要克制。");
|
|
|
}
|
|
|
- if(shuiCount>=1 && shuiCount<=3) {
|
|
|
+ if (shuiCount >= 1 && shuiCount <= 3) {
|
|
|
qiangGanContent.append("八字中水主肾,水占了1-3个肾功能强,喜性爱。");
|
|
|
}
|
|
|
- if(shuiCount==0){
|
|
|
+ if (shuiCount == 0) {
|
|
|
qiangGanContent.append("八字中无水,对性爱之事不是很上头,偶有乏力之相。");
|
|
|
}
|
|
|
|
|
|
+ //配偶的样貌
|
|
|
+ String dayZhi = ganZhiRowVoList.get(5).getName();
|
|
|
+ if (shiShenConfig.getZhangXiangHao().contains(dayZhi)) {
|
|
|
+ qiangGanContent.append("夫妻宫带‘子午卯酉’配偶的样貌长得漂亮。");
|
|
|
+ }
|
|
|
+ if (shiShenConfig.getZhangXiangZhong().contains(dayZhi)) {
|
|
|
+ qiangGanContent.append("夫妻宫带‘寅申巳亥’配偶的样貌长得一般。");
|
|
|
+ }
|
|
|
+ if (shiShenConfig.getZhangXiangCha().contains(dayZhi)) {
|
|
|
+ qiangGanContent.append("夫妻宫带‘辰戌丑未’配偶的样貌朴素敦厚。");
|
|
|
+ }
|
|
|
+
|
|
|
+ if ("元男".equals(sex)) {
|
|
|
+ String keFive = ShiShenConfig.getKeRelationship(ganZhiRowVoList.get(4).getFive()); //我克者为财
|
|
|
+ if("火".equals(keFive)) {
|
|
|
+ qiangGanContent.append("夫妻星为火,配偶外形亮丽面红润。");
|
|
|
+ }
|
|
|
+ if("木".equals(keFive)) {
|
|
|
+ qiangGanContent.append("夫妻星为木,配偶外形长得高,发秀、端庄。");
|
|
|
+ }
|
|
|
+ if("水".equals(keFive)) {
|
|
|
+ qiangGanContent.append("夫妻星为水,配偶外形微胖,圆活面黑,人机玲,相貌普通。");
|
|
|
+ }
|
|
|
+ if("土".equals(keFive)) {
|
|
|
+ qiangGanContent.append("夫妻星为土,配偶外形微胖,圆活面黑,人机玲,相貌普通。");
|
|
|
+ }
|
|
|
+ if("金".equals(keFive)) {
|
|
|
+ qiangGanContent.append("夫妻星为金,配偶外形白晰端庄。");
|
|
|
+ }
|
|
|
+ } else if ("元女".equals(sex)) {
|
|
|
+ String keWoFive = ShiShenConfig.getKeWoRelationship(ganZhiRowVoList.get(4).getFive()); //我克者为财
|
|
|
+ if("火".equals(keWoFive)) {
|
|
|
+ qiangGanContent.append("夫妻星为火,配偶外形亮丽面红润。");
|
|
|
+ }
|
|
|
+ if("木".equals(keWoFive)) {
|
|
|
+ qiangGanContent.append("夫妻星为木,配偶外形长得高,发秀、端庄。");
|
|
|
+ }
|
|
|
+ if("水".equals(keWoFive)) {
|
|
|
+ qiangGanContent.append("夫妻星为水,配偶外形微胖,圆活面黑,人机玲,相貌普通。");
|
|
|
+ }
|
|
|
+ if("土".equals(keWoFive)) {
|
|
|
+ qiangGanContent.append("夫妻星为土,配偶外形敦厚、结实身高较矮。");
|
|
|
+ }
|
|
|
+ if("金".equals(keWoFive)) {
|
|
|
+ qiangGanContent.append("夫妻星为金,配偶外形白晰端庄。");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ String dayZhiFive = ganZhiRowVoList.get(5).getFive();
|
|
|
+ String dayZhiShiShen1 = ganZhiRowVoList.get(5).getShiShen1();
|
|
|
+ String dayZhiShiShen2 = ganZhiRowVoList.get(5).getShiShen2();
|
|
|
+ String dayZhiShiShen3 = ganZhiRowVoList.get(5).getShiShen3();
|
|
|
+
|
|
|
+ if("火".equals(dayZhiFive)) {
|
|
|
+ qiangGanContent.append("夫妻宫落了火,代表皮肤不是很白。");
|
|
|
+ }
|
|
|
+ if("木".equals(dayZhiFive)) {
|
|
|
+ qiangGanContent.append("夫妻宫落了木,代表个子高。");
|
|
|
+ }
|
|
|
+ if("水".equals(dayZhiFive)) {
|
|
|
+ qiangGanContent.append("夫妻宫落了水,代表不容易上火。");
|
|
|
+ }
|
|
|
+ if("土".equals(dayZhiFive)) {
|
|
|
+ qiangGanContent.append("夫妻宫落了土,代表敦厚。");
|
|
|
+ }
|
|
|
+ if("金".equals(dayZhiFive)) {
|
|
|
+ qiangGanContent.append("夫妻宫落了金,代表身材不高。");
|
|
|
+ }
|
|
|
+
|
|
|
+ //配偶性格
|
|
|
+ if(dayGanShiShen1 != null && (dayGanShiShen1.contains("正印"))) {
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
return qiangGanContent.toString();
|
|
|
}
|
|
|
|