BUG处理。

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 piQi = ganZhiService.getBiQi(ganZhiRowVoList); //脾气
+        String piQi = ganZhiService.getPiQi(ganZhiRowVoList); //脾气
 
         GanZhiVo ganZhiVo = new GanZhiVo();
         ganZhiVo.setNongDay(lunar.getYear() + "年(生肖" + lunar.getYearShengXiao() + ")" + lunar.getMonth() + "月" + lunar.getDay() + "日" + lunar.getTime() + "时");

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

@@ -112,7 +112,9 @@ public interface IGanZhiService extends IService<GanZhi>{
 
     Map<String, String> getChenGu(Lunar lunar,Integer sex);
 
-    String getBiQi(List<GanZhiRowVo> ganZhiRowVoList);
+    String getPiQi(List<GanZhiRowVo> ganZhiRowVoList);
 
     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);
 }

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

@@ -405,7 +405,6 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
         if (score > 50) {
             fiveQr = list.get(4).getFive() + "强";
             xiYong = shiShenConfig.getXiYong().get(fiveQr);
-
             xiYongShiShen.addAll(shiShenConfig.getXiYongShiShenQ());
         } else {
             fiveQr = list.get(4).getFive() + "弱";
@@ -431,7 +430,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
         qr.put("score", score);
         qr.put("qr", fiveQr);
         qr.put("xiYong", xiYong);
-
+        qr.put("xiYongShiShen", xiYongShiShen);
         return qr;
     }
 
@@ -1775,7 +1774,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
 
 
     @Override
-    public String getBiQi(List<GanZhiRowVo> ganZhiRowVoList) {
+    public String getPiQi(List<GanZhiRowVo> ganZhiRowVoList) {
         String shiShen1 = ganZhiRowVoList.get(5).getShiShen1();
         String shiShen = shiShen1.substring(2, 4);
         String piqi = shiShenConfig.getPiQi().get(shiShen);
@@ -1840,4 +1839,62 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
     }
 
 
+    @Override
+    public String getQingGanYun(List<GanZhiRowVo> ganZhiRowVoList, Map<String, Object> riYuanQrMap, Map<String, Integer> shiShenCountMap) {
+        String qr = (String) riYuanQrMap.get("qr");
+        List<String> xiYong = (List<String>) riYuanQrMap.get("xiYong");
+        List<String> xiYongShiShen = (List<String>) riYuanQrMap.get("xiYongShiShen");
+
+
+        StringBuffer caiContent = new StringBuffer();
+        if (qr.contains("强")) {
+            caiContent.append("身强");
+        } else if (qr.contains("弱")) {
+            caiContent.append("身弱");
+        }
+
+        int pianCaiCount = shiShenCountMap.get("偏财");
+        int zhengCaiCount = shiShenCountMap.get("正财");
+
+        int totalCount = pianCaiCount + zhengCaiCount;
+        if (totalCount >= 2) {
+            caiContent.append("财旺;");
+        } else if (totalCount >= 1) {
+            caiContent.append("财弱;");
+        } else if (totalCount == 0) {
+            caiContent.append("四柱无财;");
+        }
+        if (totalCount != 0) {
+            if (pianCaiCount == 0) {
+                caiContent.append("八字无偏财，尽量不要做投机性生意;");
+            }
+            if (zhengCaiCount == 0) {
+                caiContent.append("八字没有正财，有偏财，投资要谨慎，不要借贷;");
+            }
+        }
+
+        if (caiContent.toString().contains("身强") && caiContent.toString().contains("财旺")) {
+            caiContent.append("遇大运流年，见食伤财才则发大财。年份为" + xiYong.get(0) + "、" + xiYong.get(1) + "均带有食伤财才。");
+        } else if (caiContent.toString().contains("身强") && caiContent.toString().contains("财弱")) {
+            caiContent.append("遇大运流年，见食伤财才则发中财。年份为" + xiYong.get(0) + "、" + xiYong.get(1) + "均带有食伤财才。");
+        } else if (caiContent.toString().contains("身弱") && caiContent.toString().contains("财旺")) {
+            caiContent.append("遇大运流年，见印枭比劫则发大财。年份为" + xiYong.get(0) + "、" + xiYong.get(1) + "均带有印枭比劫。");
+        } else if (caiContent.toString().contains("身弱") && caiContent.toString().contains("财弱")) {
+            caiContent.append("遇大运流年，见印枭比劫则发中财。年份为" + xiYong.get(0) + "、" + xiYong.get(1) + "均带有印枭比劫。");
+        } else if (caiContent.toString().contains("身强") && caiContent.toString().contains("四柱无财")) {
+            caiContent.append("遇大运流年，见财则有钱进账，但不长久。");
+        } else if (caiContent.toString().contains("身弱") && caiContent.toString().contains("四柱无财")) {
+            caiContent.append("不好发财，俗称和尚命。");
+        }
+
+        String monthZhi = ganZhiRowVoList.get(3).getName();
+        String nian = shiShenConfig.getWuGui().get(monthZhi);
+        String shengXiao = shiShenConfig.getWuGuiShengXiao().get(monthZhi);
+
+        caiContent.append("遇到" + shengXiao + "年（" + nian + "年），遇五鬼神煞比较容易得到偏财，但是同时也较易惹上小人、是非和灾害等。五鬼煞入命，会出现莫名其妙无风起浪的危险，因此一定要防患于未然，于官府当中更应该提防，在交友方面也应该小心，否则会有刑讼官司、破财牢狱之灾。");
+
+        return caiContent.toString();
+    }
+
+
 }