婚姻情感

xpgx-admin/src/main/java/com/miaxis/app/controller/gan/GanZhiController.java

@@ -118,7 +118,7 @@ public class GanZhiController extends BaseController {
 
         String caiYun = ganZhiService.getCaiYun(ganZhiRowVoList, riYuanQrMap, shiShenCountMap);
 
-        String qingGan = ganZhiService.getQingGanYun(ganZhiRowVoList,riYuanQrMap, shiShenCountMap); //情感
+        String qingGan = ganZhiService.getQingGanYun(ganZhiRowVoList,riYuanQrMap, shiShenCountMap, fiveCountMap); //情感
         String piQi = ganZhiService.getPiQi(ganZhiRowVoList); //脾气
 
 

xpgx-service/src/main/java/com/miaxis/gan/service/IGanZhiService.java

@@ -116,5 +116,5 @@ public interface IGanZhiService extends IService<GanZhi>{
 
     String getCaiYun(List<GanZhiRowVo> ganZhiRowVoList, Map<String, Object> riYuanQrMap, Map<String, Integer> shiShenCountMap);
 
-    String getQingGanYun(List<GanZhiRowVo> ganZhiRowVoList, Map<String, Object> riYuanQrMap, Map<String, Integer> shiShenCountMap);
+    String getQingGanYun(List<GanZhiRowVo> ganZhiRowVoList, Map<String, Object> riYuanQrMap, Map<String, Integer> shiShenCountMap, Map<String, Integer> fiveCountMap);
 }

xpgx-service/src/main/java/com/miaxis/gan/service/impl/GanZhiServiceImpl.java

@@ -1845,7 +1845,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
 
 
     @Override
-    public String getQingGanYun(List<GanZhiRowVo> ganZhiRowVoList, Map<String, Object> riYuanQrMap, Map<String, Integer> shiShenCountMap) {
+    public String getQingGanYun(List<GanZhiRowVo> ganZhiRowVoList, Map<String, Object> riYuanQrMap, Map<String, Integer> shiShenCountMap, Map<String, Integer> fiveCountMap) {
         String qr = (String) riYuanQrMap.get("qr");
         List<String> xiYong = (List<String>) riYuanQrMap.get("xiYong");
         List<String> xiYongOld = (List<String>) riYuanQrMap.get("xiYongOld");
@@ -1918,7 +1918,34 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
             String dayGan = ganZhiRowVoList.get(4).getName();
             String timeGan = ganZhiRowVoList.get(6).getName();
 
-            shiShenConfig.getTianGanYY().get("tianGanYY");
+            String yearGanYY = shiShenConfig.getTianGanYY().get(yearGan);
+            String monthGanYY = shiShenConfig.getTianGanYY().get(monthGan);
+            String dayGanYY = shiShenConfig.getTianGanYY().get(dayGan);
+            String timeGanYY = shiShenConfig.getTianGanYY().get(timeGan);
+
+            if ("阴".equals(yearGanYY) && "阴".equals(monthGanYY) && "阴".equals(dayGanYY) && "阴".equals(timeGanYY)) {
+                qiangGanContent.append("男性四柱全阴，体现出较女性化，可能有同性取向的趋向。");
+            }
+
+            int fuqiGongBiCount = 0;  //夫妻宫比肩 劫财的数量
+            for (int i = 2; i < ganZhiRowVoList.size(); i++) {
+                String shiShen1 = ganZhiRowVoList.get(i).getShiShen1();
+                String shiShen2 = ganZhiRowVoList.get(i).getShiShen2();
+                String shiShen3 = ganZhiRowVoList.get(i).getShiShen3();
+                if (shiShen1 != null && (shiShen1.contains("比肩") || shiShen1.contains("劫财"))) {
+                    fuqiGongBiCount++;
+                }
+                if (shiShen2 != null && (shiShen2.contains("比肩") || shiShen2.contains("劫财"))) {
+                    fuqiGongBiCount++;
+                }
+                if (shiShen3 != null && (shiShen3.contains("比肩") || shiShen3.contains("劫财"))) {
+                    fuqiGongBiCount++;
+                }
+            }
+
+            if(fuqiGongBiCount>=3) {
+                qiangGanContent.append("男命夫妻宫周围过多的比劫，可能出现夫妻感情不和睦的情况。");
+            }
 
 
         } else if ("元女".equals(sex)) {
@@ -1930,9 +1957,9 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
                 qiangGanContent.append("女人四柱无官杀，找老公会比较困难，自己也不太愿意结婚。");
             }
             if (qr.contains("强")) {
-                qiangGanContent.append("夫妻星为喜用，婚后夫妻关系还不错");
+                qiangGanContent.append("夫妻星为喜用，婚后夫妻关系还不错；");
             } else if (qr.contains("弱")) {
-                qiangGanContent.append("夫妻星为忌凶，婚后夫妻关系不是很幸福");
+                qiangGanContent.append("夫妻星为忌凶，婚后夫妻关系不是很幸福；");
             }
 
             if (qr.contains("强") && xiYong.contains(five)) {  //强喜
@@ -1969,6 +1996,41 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
                 qiangGanContent.append("在夫妻宫余气坐落偏印，夫妻不和睦之相。");
             }
 
+            String yearGan = ganZhiRowVoList.get(0).getName();
+            String monthGan = ganZhiRowVoList.get(2).getName();
+            String dayGan = ganZhiRowVoList.get(4).getName();
+            String timeGan = ganZhiRowVoList.get(6).getName();
+
+            String yearGanYY = shiShenConfig.getTianGanYY().get(yearGan);
+            String monthGanYY = shiShenConfig.getTianGanYY().get(monthGan);
+            String dayGanYY = shiShenConfig.getTianGanYY().get(dayGan);
+            String timeGanYY = shiShenConfig.getTianGanYY().get(timeGan);
+
+            if ("阳".equals(yearGanYY) && "阳".equals(monthGanYY) && "阳".equals(dayGanYY) && "阳".equals(timeGanYY)) {
+                qiangGanContent.append("女性四柱全阳，体现出较男性化，可能有同性取向的趋向。");
+            }
+
+            int fuqiGongShangCount = 0;  //夫妻宫伤官的数量
+            for (int i = 2; i < ganZhiRowVoList.size(); i++) {
+                String shiShen1 = ganZhiRowVoList.get(i).getShiShen1();
+                String shiShen2 = ganZhiRowVoList.get(i).getShiShen2();
+                String shiShen3 = ganZhiRowVoList.get(i).getShiShen3();
+                if (shiShen1 != null && shiShen1.contains("伤官")) {
+                    fuqiGongShangCount++;
+                }
+                if (shiShen2 != null && shiShen2.contains("伤官")) {
+                    fuqiGongShangCount++;
+                }
+                if (shiShen3 != null && shiShen3.contains("伤官")) {
+                    fuqiGongShangCount++;
+                }
+            }
+
+            if(fuqiGongShangCount>=3) {
+                qiangGanContent.append("女命夫妻宫周围过多的伤官，可能出现夫妻感情不和睦的情况。");
+            }
+
+
         }
 
 
@@ -1996,6 +2058,57 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
             qiangGanContent.append("地支中子午卯酉，相对比较旺。流年容易遇桃花之事。");
         }
 
+        //性冷淡
+        String dayGanShiShen1 = ganZhiRowVoList.get(5).getShiShen1();
+        String dayGanShiShen2 = ganZhiRowVoList.get(5).getShiShen2();
+        String dayGanShiShen3 = ganZhiRowVoList.get(5).getShiShen3();
+
+        if (dayGanShiShen1 != null && dayGanShiShen1.contains("食神")) {
+            qiangGanContent.append("夫妻宫坐了食神，比较喜欢性爱之事。");
+        }
+        if (dayGanShiShen2 != null && dayGanShiShen2.contains("食神")) {
+            qiangGanContent.append("夫妻宫坐了食神，比较喜欢性爱之事。");
+        }
+        if (dayGanShiShen3 != null && dayGanShiShen3.contains("食神")) {
+            qiangGanContent.append("夫妻宫坐了食神，比较喜欢性爱之事。");
+        }
+
+        if (dayGanShiShen1 != null && (dayGanShiShen1.contains("正印") ||  dayGanShiShen1.contains("偏印"))) {
+            qiangGanContent.append("夫妻宫坐了印，性欲有被克制之相，会性较冷淡。");
+        }
+        if (dayGanShiShen2 != null && (dayGanShiShen2.contains("正印") ||  dayGanShiShen2.contains("偏印"))) {
+            qiangGanContent.append("夫妻宫坐了印，性欲有被克制之相，会性较冷淡。");
+        }
+        if (dayGanShiShen3 != null && (dayGanShiShen3.contains("正印") ||  dayGanShiShen3.contains("偏印"))) {
+            qiangGanContent.append("夫妻宫坐了印，性欲有被克制之相，会性较冷淡。");
+        }
+
+        String monthGanShiShen1 = ganZhiRowVoList.get(3).getShiShen1();
+        String monthGanShiShen2 = ganZhiRowVoList.get(3).getShiShen2();
+        String monthGanShiShen3 = ganZhiRowVoList.get(3).getShiShen3();
+
+        if (monthGanShiShen1 != null && monthGanShiShen1.contains("正印")) {
+            qiangGanContent.append("月令坐了正印，性欲有被克制之相，会性较冷淡，对学业工作会花较多精力。");
+        }
+        if (monthGanShiShen2 != null && monthGanShiShen2.contains("正印")) {
+            qiangGanContent.append("月令坐了正印，性欲有被克制之相，会性较冷淡，对学业工作会花较多精力。");
+        }
+        if (monthGanShiShen3 != null && monthGanShiShen3.contains("正印")) {
+            qiangGanContent.append("月令坐了正印，性欲有被克制之相，会性较冷淡，对学业工作会花较多精力。");
+        }
+
+        //水主肾
+        int shuiCount = fiveCountMap.get("水");
+
+        if(shuiCount>=4) {
+            qiangGanContent.append("八字中水主肾，水过旺，喜性爱，需要克制。");
+        }
+        if(shuiCount>=1 && shuiCount<=3) {
+            qiangGanContent.append("八字中水主肾，水占了1-3个肾功能强，喜性爱。");
+        }
+        if(shuiCount==0){
+            qiangGanContent.append("八字中无水，对性爱之事不是很上头，偶有乏力之相。");
+        }
 
         return qiangGanContent.toString();
     }