婚姻情感

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

@@ -123,7 +123,7 @@ public class GanZhiController extends BaseController {
         Map<String, Integer> zaoShiCount = ganZhiService.getZaoShiCount(ganZhiRowVoList, fiveCountMap, reportMap);
         List<DiseasePart> diseasePartList = ganZhiService.getJiBing(ganZhiRowVoList, fiveCountMap);
 
-        String caiYun = ganZhiService.getCaiYun(ganZhiRowVoList, riYuanQrMap, shiShenCountMap);
+        Map<Integer,String> caiYun = ganZhiService.getCaiYun(ganZhiRowVoList, riYuanQrMap, shiShenCountMap);
 
         Map<Integer,String> qingGan = ganZhiService.getQingGanYun(ganZhiRowVoList, riYuanQrMap, shiShenCountMap, fiveCountMap, geju); //情感
         String piQi = ganZhiService.getPiQi(ganZhiRowVoList); //脾气
@@ -153,8 +153,8 @@ public class GanZhiController extends BaseController {
         ganZhiVo.setChenGuMap(chenGuMap);
         ganZhiVo.setPiQi(piQi);
         ganZhiVo.setQingGan(qingGan);
+        ganZhiVo.setCaiYun(caiYun);
 
-        reportMap.put("财运", caiYun);
         ganZhiVo.setReportMap(reportMap);
 
         // 输出结果

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

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

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

@@ -1670,7 +1670,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
 
     @Override
     public Map<Integer, String> getXiFangWei(Lunar lunar) {
-        int x = 0;  //序号
+        int x = 1;  //序号
 
         Map<Integer, String> xiFangMap = new TreeMap<Integer, String>();
         String str = lunar.toFullString();
@@ -1789,16 +1789,21 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
     }
 
     @Override
-    public String getCaiYun(List<GanZhiRowVo> ganZhiRowVoList, Map<String, Object> riYuanQrMap, Map<String, Integer> shiShenCountMap) {
+    public Map<Integer, String> getCaiYun(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> xiYongOld = (List<String>) riYuanQrMap.get("xiYongOld");
 
+        int x = 1;  //序号
+        Map<Integer, String> caiMap = new TreeMap<Integer, String>();
+        StringBuffer caiQrContent = new StringBuffer();
 
         StringBuffer caiContent = new StringBuffer();
         if (qr.contains("强")) {
+            caiQrContent.append("身强");
             caiContent.append("身强");
         } else if (qr.contains("弱")) {
+            caiQrContent.append("身强");
             caiContent.append("身弱");
         }
 
@@ -1807,55 +1812,84 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
 
         int totalCount = pianCaiCount + zhengCaiCount;
         if (totalCount >= 2) {
-            caiContent.append("财旺;");
+            caiQrContent.append("财旺；");
+            caiContent.append("财旺；");
         } else if (totalCount >= 1) {
-            caiContent.append("财弱;");
+            caiQrContent.append("财弱；");
+            caiContent.append("财弱；");
         } else if (totalCount == 0) {
-            caiContent.append("四柱无财;");
+            caiQrContent.append("四柱无财；");
+            caiContent.append("四柱无财；");
         }
+
+        if (caiQrContent.toString().length() > 0) {     //如果有内容写进去
+            caiMap.put(x++, caiQrContent.toString());
+        }
+
+        StringBuffer wuCaiContent = new StringBuffer();
         if (totalCount != 0) {
             if (pianCaiCount == 0) {
-                caiContent.append("八字无偏财，尽量不要做投机性生意;");
+                wuCaiContent.append("八字无偏财，尽量不要做投机性生意；");
+                caiContent.append("八字无偏财，尽量不要做投机性生意；");
             }
             if (zhengCaiCount == 0) {
-                caiContent.append("八字没有正财，有偏财，投资要谨慎，不要借贷;");
+                wuCaiContent.append("八字没有正财，有偏财，投资要谨慎，不要借贷；");
+                caiContent.append("八字没有正财，有偏财，投资要谨慎，不要借贷；");
             }
         }
 
+        if (wuCaiContent.toString().length() > 0) {     //如果有内容写进去
+            caiMap.put(x++, wuCaiContent.toString());
+        }
 
+        StringBuffer caiQrWrContent = new StringBuffer();
         if (caiContent.toString().contains("身强") && caiContent.toString().contains("财旺")) {
+            caiQrWrContent.append("遇大运流年，见食伤财才则发大财。年份为" + xiYongOld.get(0) + "、" + xiYongOld.get(1) + "均带有食伤财才。");
             caiContent.append("遇大运流年，见食伤财才则发大财。年份为" + xiYongOld.get(0) + "、" + xiYongOld.get(1) + "均带有食伤财才。");
         } else if (caiContent.toString().contains("身强") && caiContent.toString().contains("财弱")) {
+            caiQrWrContent.append("遇大运流年，见食伤财才则发中财。年份为" + xiYongOld.get(0) + "、" + xiYongOld.get(1) + "均带有食伤财才。");
             caiContent.append("遇大运流年，见食伤财才则发中财。年份为" + xiYongOld.get(0) + "、" + xiYongOld.get(1) + "均带有食伤财才。");
         } else if (caiContent.toString().contains("身弱") && caiContent.toString().contains("财旺")) {
+            caiQrWrContent.append("遇大运流年，见印枭比劫则发大财。年份为" + xiYongOld.get(0) + "、" + xiYongOld.get(1) + "均带有印枭比劫。");
             caiContent.append("遇大运流年，见印枭比劫则发大财。年份为" + xiYongOld.get(0) + "、" + xiYongOld.get(1) + "均带有印枭比劫。");
         } else if (caiContent.toString().contains("身弱") && caiContent.toString().contains("财弱")) {
+            caiQrWrContent.append("遇大运流年，见印枭比劫则发中财。年份为" + xiYongOld.get(0) + "、" + xiYongOld.get(1) + "均带有印枭比劫。");
             caiContent.append("遇大运流年，见印枭比劫则发中财。年份为" + xiYongOld.get(0) + "、" + xiYongOld.get(1) + "均带有印枭比劫。");
         } else if (caiContent.toString().contains("身强") && caiContent.toString().contains("四柱无财")) {
+            caiQrWrContent.append("遇大运流年，见财则有钱进账，但不长久。");
             caiContent.append("遇大运流年，见财则有钱进账，但不长久。");
         } else if (caiContent.toString().contains("身弱") && caiContent.toString().contains("四柱无财")) {
+            caiQrWrContent.append("不好发财，俗称和尚命。");
             caiContent.append("不好发财，俗称和尚命。");
         }
 
+        if (caiQrWrContent.toString().length() > 0) {     //如果有内容写进去
+            caiMap.put(x++, caiQrWrContent.toString());
+        }
 
         String monthZhi = ganZhiRowVoList.get(3).getName();
         String nian = shiShenConfig.getWuGui().get(monthZhi);
         String shengXiao = shiShenConfig.getWuGuiShengXiao().get(monthZhi);
 
+        StringBuffer wuGuiConent = new StringBuffer();
+        wuGuiConent.append("遇到" + shengXiao + "年（" + nian + "年），遇五鬼神煞比较容易得到偏财，但是同时也较易惹上小人、是非和灾害等。五鬼煞入命，会出现莫名其妙无风起浪的危险，因此一定要防患于未然，于官府当中更应该提防，在交友方面也应该小心，否则会有刑讼官司、破财牢狱之灾。");
+        if (wuGuiConent.toString().length() > 0) {     //如果有内容写进去
+            caiMap.put(x++, wuGuiConent.toString());
+        }
         caiContent.append("遇到" + shengXiao + "年（" + nian + "年），遇五鬼神煞比较容易得到偏财，但是同时也较易惹上小人、是非和灾害等。五鬼煞入命，会出现莫名其妙无风起浪的危险，因此一定要防患于未然，于官府当中更应该提防，在交友方面也应该小心，否则会有刑讼官司、破财牢狱之灾。");
 
-        return caiContent.toString();
+        return caiMap;
     }
 
 
     @Override
-    public Map<Integer,String> getQingGanYun(List<GanZhiRowVo> ganZhiRowVoList, Map<String, Object> riYuanQrMap, Map<String, Integer> shiShenCountMap, Map<String, Integer> fiveCountMap, String geju) {
+    public Map<Integer, String> getQingGanYun(List<GanZhiRowVo> ganZhiRowVoList, Map<String, Object> riYuanQrMap, Map<String, Integer> shiShenCountMap, Map<String, Integer> fiveCountMap, String geju) {
         String qr = (String) riYuanQrMap.get("qr");
         List<String> xiYong = (List<String>) riYuanQrMap.get("xiYong");
         List<String> xiYongOld = (List<String>) riYuanQrMap.get("xiYongOld");
         List<String> xiYongShiShen = (List<String>) riYuanQrMap.get("xiYongShiShen");
 
-        int x = 0;  //序号
+        int x = 1;  //序号
         Map<Integer, String> qiangGanMap = new TreeMap<Integer, String>();
         StringBuffer qiangGanContent = new StringBuffer();
 
@@ -1893,7 +1927,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
                 qiangGanContent.append("也能不太能够得到老婆家族的帮助。");
             }
 
-            if(zhengCaiContent.toString().length()>0) {     //如果有内容写进去
+            if (zhengCaiContent.toString().length() > 0) {     //如果有内容写进去
                 qiangGanMap.put(x++, zhengCaiContent.toString());
             }
 
@@ -1943,7 +1977,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
                 qiangGanContent.append("在夫妻宫余气坐落偏印，夫妻不和睦之相。");
             }
 
-            if(jieCaiContent.toString().length()>0) {     //如果有内容写进去
+            if (jieCaiContent.toString().length() > 0) {     //如果有内容写进去
                 qiangGanMap.put(x++, jieCaiContent.toString());
             }
 
@@ -1965,7 +1999,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
                 qiangGanContent.append("男性四柱全阴，体现出较女性化，可能有同性取向的趋向。");
             }
 
-            if(quangContent.toString().length()>0) {     //如果有内容写进去
+            if (quangContent.toString().length() > 0) {     //如果有内容写进去
                 qiangGanMap.put(x++, quangContent.toString());
             }
 
@@ -1992,7 +2026,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
                 qiangGanContent.append("男命夫妻宫周围过多的比劫，可能出现夫妻感情不和睦的情况。");
             }
 
-            if(fuqiGongBiContent.toString().length()>0) {     //如果有内容写进去
+            if (fuqiGongBiContent.toString().length() > 0) {     //如果有内容写进去
                 qiangGanMap.put(x++, fuqiGongBiContent.toString());
             }
 
@@ -2028,7 +2062,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
                 qiangGanContent.append("也能不太能够得到老公家族的帮助。");
             }
 
-            if(fuqiXingContent.toString().length()>0) {     //如果有内容写进去
+            if (fuqiXingContent.toString().length() > 0) {     //如果有内容写进去
                 qiangGanMap.put(x++, fuqiXingContent.toString());
             }
 
@@ -2064,7 +2098,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
                 qiangGanContent.append("在夫妻宫余气坐落偏印，有轻微夫妻不和睦之相。");
             }
 
-            if(fuqiGuContent.toString().length()>0) {     //如果有内容写进去
+            if (fuqiGuContent.toString().length() > 0) {     //如果有内容写进去
                 qiangGanMap.put(x++, fuqiGuContent.toString());
             }
 
@@ -2085,7 +2119,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
                 qiangGanContent.append("女性四柱全阳，体现出较男性化，可能有同性取向的趋向。");
             }
 
-            if(quangyinCountent.toString().length()>0) {     //如果有内容写进去
+            if (quangyinCountent.toString().length() > 0) {     //如果有内容写进去
                 qiangGanMap.put(x++, quangyinCountent.toString());
             }
 
@@ -2112,7 +2146,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
                 qiangGanContent.append("女命夫妻宫周围过多的伤官，可能出现夫妻感情不和睦的情况。");
             }
 
-            if(fuqiGongShangContent.toString().length()>0) {     //如果有内容写进去
+            if (fuqiGongShangContent.toString().length() > 0) {     //如果有内容写进去
                 qiangGanMap.put(x++, fuqiGongShangContent.toString());
             }
 
@@ -2148,7 +2182,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
             qiangGanContent.append("地支中子午卯酉，相对比较旺。流年容易遇桃花之事。");
         }
 
-        if(taohuaContent.toString().length()>0) {     //如果有内容写进去
+        if (taohuaContent.toString().length() > 0) {     //如果有内容写进去
             qiangGanMap.put(x++, taohuaContent.toString());
         }
 
@@ -2221,12 +2255,11 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
             qiangGanContent.append("八字中无水，对性爱之事不是很上头，偶有乏力之相。");
         }
 
-        if(xinglenContent.toString().length()>0) {     //如果有内容写进去
+        if (xinglenContent.toString().length() > 0) {     //如果有内容写进去
             qiangGanMap.put(x++, xinglenContent.toString());
         }
 
 
-
         //配偶的样貌
         StringBuffer yangmaoContent = new StringBuffer();
         String dayZhi = ganZhiRowVoList.get(5).getName();
@@ -2316,12 +2349,11 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
             qiangGanContent.append("夫妻宫落了金，代表身材不高。");
         }
 
-        if(yangmaoContent.toString().length()>0) {     //如果有内容写进去
+        if (yangmaoContent.toString().length() > 0) {     //如果有内容写进去
             qiangGanMap.put(x++, yangmaoContent.toString());
         }
 
 
-
         //配偶性格
         StringBuffer xingGeContent = new StringBuffer();
         //印枭
@@ -2436,7 +2468,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
             qiangGanContent.append("夫妻宫余气落了劫财代表了配偶比较滑头，收入不太稳定。");
         }
 
-        if(xingGeContent.toString().length()>0) {     //如果有内容写进去
+        if (xingGeContent.toString().length() > 0) {     //如果有内容写进去
             qiangGanMap.put(x++, xingGeContent.toString());
         }
 
@@ -2448,12 +2480,11 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
         nianJiConent.append(peiouOld);
         qiangGanContent.append(peiouOld);
 
-        if(nianJiConent.toString().length()>0) {     //如果有内容写进去
+        if (nianJiConent.toString().length() > 0) {     //如果有内容写进去
             qiangGanMap.put(x++, nianJiConent.toString());
         }
 
 
-
         //八字看配偶的方向
 
         StringBuffer peiouFangWeiContent = new StringBuffer();
@@ -2497,7 +2528,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
         peiouFangWeiContent.append("你的配偶和你的方位是" + fangWeiA + "————" + fangWeiB + "（你们的出生地的家为准，两点连线。）");
         qiangGanContent.append("你的配偶和你的方位是" + fangWeiA + "————" + fangWeiB + "（你们的出生地的家为准，两点连线。）");
 
-        if(peiouFangWeiContent.toString().length()>0) {     //如果有内容写进去
+        if (peiouFangWeiContent.toString().length() > 0) {     //如果有内容写进去
             qiangGanMap.put(x++, peiouFangWeiContent.toString());
         }
 

xpgx-service/src/main/java/com/miaxis/gan/vo/GanZhiVo.java

@@ -82,6 +82,9 @@ public class GanZhiVo {
     @ApiModelProperty(value = "脾气")
     private String piQi;
 
+    @ApiModelProperty(value = "情感")
+    private Map<Integer,String> caiYun;
+
     @ApiModelProperty(value = "情感")
     private Map<Integer,String> qingGan;