BUG处理。

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

@@ -872,7 +872,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
         timeZhi.setGongWei("时支");
         timeZhi.setFive(timeZhiFive);
         timeZhi.setColor(timeZhiColor);
-        timeZhi.setName(ganZhiDto.getDayZhi());
+        timeZhi.setName(ganZhiDto.getTimeZhi());
 
         List<GanZhiRowVo> list = new ArrayList<GanZhiRowVo>();
         list.add(yearGan);
@@ -1163,36 +1163,23 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
     @Override
     public Map<Integer, String> getGuo3Guan(List<GanZhiRowVo> list, String qr) {
 
-        String yearGan = list.get(0).getShiShen1();
-        String yearZhi = list.get(1).getShiShen1();
-        String monthGan = list.get(2).getShiShen1();
-        String monthZhi = list.get(3).getShiShen1();
-        String dayGan = list.get(4).getShiShen1();
-        String dayZhi = list.get(5).getShiShen1();
-        String timeGan = list.get(6).getShiShen1();
-        String timeZhi = list.get(7).getShiShen1();
-
-        int x = 1;
-        Map<Integer,String> guo3GuanMap = new TreeMap<Integer, String>();
-
-
+        int x = 1; //用来做序号
+        Map<Integer, String> guo3GuanMap = new TreeMap<Integer, String>();
 
         //1.八字带午火脾气最不好
         for (int i = 0; i < list.size(); i++) {
             if ((i == 1 || i == 3 || i == 5 || i == 7) && i != 4) {   //地支
                 if ("午".equals(list.get(i).getName())) {
-                    guo3GuanMap.put(x++,"脾气比较大，容易发火。");
-                    System.out.println("脾气比较大，容易发火。");
+                    guo3GuanMap.put(x++, "脾气比较大，容易发火。");
+                    break;
                 }
             }
         }
         //2.身强身弱
         if (qr.contains("强")) {
-            guo3GuanMap.put(x++,"容易破财，被人劫财。");
-            System.out.println("容易破财，被人劫财。");
+            guo3GuanMap.put(x++, "容易破财，被人劫财。");
         } else if (qr.contains("弱")) {
-            guo3GuanMap.put(x++,"不太好赚钱，看着别人发财，自己却不容易挣钱。");
-            System.out.println("不太好赚钱，看着别人发财，自己却不容易挣钱。");
+            guo3GuanMap.put(x++, "不太好赚钱，看着别人发财，自己却不容易挣钱。");
         }
 
         //3.有甲有金，面部有伤或者头部有伤
@@ -1216,8 +1203,7 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
             }
         }
         if (jia == true && jin == true) {
-            guo3GuanMap.put(x++,"面部有伤或者头部有伤。");
-            System.out.println("面部有伤或者头部有伤。");
+            guo3GuanMap.put(x++, "面部有伤或者头部有伤。");
         }
 
         //4.八字那个宫位有土，哪里有坑痕疤痣。
@@ -1226,133 +1212,160 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
         for (int i = 0; i < list.size(); i++) {
             if (tu.contains(list.get(i).getName())) {
                 tuContent.append(shiShenConfig.getBody().get(i));
-                tuContent.append(";");
+                tuContent.append("、");
             }
         }
-        if(tuContent.toString().length()>0) {
+        if (tuContent.toString().length() > 0) {
+            tuContent.deleteCharAt(tuContent.length() - 1);
             tuContent.append("以上身体部位存在伤疤或痣。");
-            guo3GuanMap.put(x++,tuContent.toString());
-            System.out.println(tuContent.toString());
+            guo3GuanMap.put(x++, tuContent.toString());
         }
 
         //5.卯为电脑，显示类的东西（需要住满3年以上）
         StringBuffer maoContent = new StringBuffer();
+        StringBuffer maoC = new StringBuffer();
         for (int i = 0; i < list.size(); i++) {
             if ("卯".equals(list.get(i).getName())) {
-                maoContent.append(shiShenConfig.getPosition().get(i));
-                maoContent.append(";");
+                maoC.append(shiShenConfig.getPosition().get(i));
+                maoC.append("、");
             }
         }
-        if(maoContent.toString().length()>0) {
-            maoContent.append("如果当前住所居住满3年以上，以上方位存在电脑或显示器类的物品。");
-            guo3GuanMap.put(x++,maoContent.toString());
-            System.out.println(maoContent.toString());
+        if (maoC.toString().length() > 0) {
+            maoC.deleteCharAt(maoC.length() - 1);
+            maoContent.append("如果在当前住所居住满3年以上，");
+            maoContent.append(maoC);
+            maoContent.append("存在电脑或显示器类的物品。");
+            guo3GuanMap.put(x++, maoContent.toString());
         }
 
         //6.偏印为翅膀，羽毛，会飞的东西（需要住满3年以上）
         StringBuffer pianContent = new StringBuffer();
+        StringBuffer pianC = new StringBuffer();
         for (int i = 0; i < list.size(); i++) {
-            if (list.get(i).getShiShen1().contains("偏印") || (list.get(i).getShiShen2()!=null && list.get(i).getShiShen2().contains("偏印")) || (list.get(i).getShiShen3()!=null && list.get(i).getShiShen3().contains("偏印"))) {
-                pianContent.append(shiShenConfig.getPosition().get(i));
-                pianContent.append(";");
+            if (list.get(i).getShiShen1().contains("偏印")
+                    || (list.get(i).getShiShen2() != null && list.get(i).getShiShen2().contains("偏印"))
+                    || (list.get(i).getShiShen3() != null && list.get(i).getShiShen3().contains("偏印"))) {
+                pianC.append(shiShenConfig.getPosition().get(i));
+                pianC.append("、");
             }
         }
-        if(pianContent.toString().length()>0) {
-            pianContent.append("如果当前住所居住满3年以上，以上方位存在带有翅膀，羽毛，会飞的东西物品或摆件。");
-            guo3GuanMap.put(x++,pianContent.toString());
-            System.out.println(pianContent.toString());
+        if (pianC.toString().length() > 0) {
+            pianC.deleteCharAt(pianC.length() - 1);
+            pianContent.append("如果在当前住所居住满3年以上，");
+            pianContent.append(pianC);
+            pianContent.append("存在带有翅膀，羽毛，会飞的东西物品或摆件。");
+            guo3GuanMap.put(x++, pianContent.toString());
         }
 
 
-
         //7.正财代表女人，钱，珠宝
         StringBuffer zhengcaiContent = new StringBuffer();
+        StringBuffer zhengcaiC = new StringBuffer();
         for (int i = 0; i < list.size(); i++) {
-            if (list.get(i).getShiShen1().contains("正财") || (list.get(i).getShiShen2()!=null && list.get(i).getShiShen2().contains("正财")) || (list.get(i).getShiShen3()!=null && list.get(i).getShiShen3().contains("正财"))) {
-                zhengcaiContent.append(shiShenConfig.getPosition().get(i));
-                zhengcaiContent.append(";");
+            if (list.get(i).getShiShen1().contains("正财")
+                    || (list.get(i).getShiShen2() != null && list.get(i).getShiShen2().contains("正财"))
+                    || (list.get(i).getShiShen3() != null && list.get(i).getShiShen3().contains("正财"))) {
+                zhengcaiC.append(shiShenConfig.getPosition().get(i));
+                zhengcaiC.append("、");
             }
         }
-        if(zhengcaiContent.toString().length()>0) {
-            zhengcaiContent.append("如果当前住所居住满3年以上，以上方位存在带有女性，照片，结婚证，金钱，珠宝，较有价值的物品。");
-            guo3GuanMap.put(x++,zhengcaiContent.toString());
+        if (zhengcaiC.toString().length() > 0) {
+            zhengcaiC.deleteCharAt(zhengcaiC.length() - 1);
+            zhengcaiContent.append("如果在当前住所居住满3年以上，");
+            zhengcaiContent.append(zhengcaiC);
+            zhengcaiContent.append("存在带有女性照片，结婚证，金钱，珠宝，较有价值的物品。");
+            guo3GuanMap.put(x++, zhengcaiContent.toString());
             System.out.println(zhengcaiContent.toString());
         }
 
 
         //8.正印代表文件，书籍
         StringBuffer zhengyinContent = new StringBuffer();
+        StringBuffer zhengyinC = new StringBuffer();
         for (int i = 0; i < list.size(); i++) {
-            if (list.get(i).getShiShen1().contains("正印") || (list.get(i).getShiShen2() != null && list.get(i).getShiShen2().contains("正印")) || (list.get(i).getShiShen3() != null && list.get(i).getShiShen3().contains("正印"))) {
-                zhengyinContent.append(shiShenConfig.getPosition().get(i));
-                zhengyinContent.append(";");
+            if (list.get(i).getShiShen1().contains("正印")
+                    || (list.get(i).getShiShen2() != null && list.get(i).getShiShen2().contains("正印"))
+                    || (list.get(i).getShiShen3() != null && list.get(i).getShiShen3().contains("正印"))) {
+                zhengyinC.append(shiShenConfig.getPosition().get(i));
+                zhengyinC.append("、");
             }
         }
-        if(zhengyinContent.toString().length()>0) {
-            zhengyinContent.append("如果当前住所居住满3年以上，以上方位存在带有女性照片，结婚证，金钱，珠宝，较有价值的物品。");
-            guo3GuanMap.put(x++,zhengyinContent.toString());
+        if (zhengyinC.toString().length() > 0) {
+            zhengyinC.deleteCharAt(zhengyinC.length() - 1);
+            zhengyinContent.append("如果在当前住所居住满3年以上，");
+            zhengyinContent.append(zhengyinC);
+            zhengyinContent.append("存在文件、书籍等物品。");
+            guo3GuanMap.put(x++, zhengyinContent.toString());
             System.out.println(zhengyinContent.toString());
         }
 
 
         //9.丁火喜欢熬夜
         if (list.get(4).getName().equals("丁")) {
-            System.out.println("你比较喜欢熬夜，到晚上会比较有精神。");
-            guo3GuanMap.put(x++,"你比较喜欢熬夜，到晚上会比较有精神。");
+            guo3GuanMap.put(x++, "你比较喜欢熬夜，到晚上会比较有精神。");
         }
         if (list.get(6).getName().equals("丁")) {
-            System.out.println("你的孩子比较喜欢熬夜，到晚上会比较有精神。");
-            guo3GuanMap.put(x++,"你的孩子比较喜欢熬夜，到晚上会比较有精神。");
+            guo3GuanMap.put(x++, "你的孩子比较喜欢熬夜，到晚上会比较有精神。");
         }
 
 
         //10.八字那个宫位有土，哪里有坑痕疤痣。
         StringBuffer shenContent = new StringBuffer();
+        StringBuffer shenC = new StringBuffer();
         String shen = "辰戌丑未";
         for (int i = 0; i < list.size(); i++) {
             if (shen.contains(list.get(i).getName())) {
-                shenContent.append(shiShenConfig.getBody().get(i));
-                shenContent.append(";");
+                shenC.append(shiShenConfig.getPosition().get(i));
+                shenC.append("、");
             }
         }
-        if(shenContent.toString().length()>0) {
-            shenContent.append("如果你在当前住所居住满3年以上，以上方位存在神佛类物品或摆件（包含中西方诸神，佛主、耶稣等等）。");
-            System.out.println(shenContent.toString());
-            guo3GuanMap.put(x++,shenContent.toString());
+        if (shenC.toString().length() > 0) {
+            shenC.deleteCharAt(shenC.length() - 1);
+            shenContent.append("如果在当前住所居住满3年以上，");
+            shenContent.append(shenC);
+            shenContent.append("存在神佛类物品或摆件（包含中西方诸神，佛主、耶稣等等）。");
+            guo3GuanMap.put(x++, shenContent.toString());
         }
 
 
         //11.酉金为瓶瓶罐罐，能发出声音的物品
         StringBuffer youContent = new StringBuffer();
+        StringBuffer youC = new StringBuffer();
         for (int i = 0; i < list.size(); i++) {
             if ("酉".equals(list.get(i).getName())) {
-                youContent.append(shiShenConfig.getBody().get(i));
-                youContent.append(";");
+                youC.append(shiShenConfig.getBody().get(i));
+                youC.append("、");
             }
         }
-        if(youContent.toString().length()>0) {
-            youContent.append("如果你在当前住所居住满3年以上，以上方位瓶瓶罐罐，能发出声音的物品，如耳机音箱之类。");
-            System.out.println(youContent.toString());
-            guo3GuanMap.put(x++,youContent.toString());
+        if (youContent.toString().length() > 0) {
+            youC.deleteCharAt(youC.length() - 1);
+            youContent.append("如果在当前住所居住满3年以上，");
+            youContent.append(youC);
+            youContent.append("存在瓶瓶罐罐，能发出声音的物品，如耳机音箱之类。");
+            guo3GuanMap.put(x++, youContent.toString());
         }
 
 
         //12.酉金带食神
         boolean sing = false;
         for (int i = 0; i < list.size(); i++) {
-            if ("酉".equals(list.get(i).getName()) && (list.get(i).getShiShen1()!=null && list.get(i).getShiShen1().contains("食神")) || (list.get(i).getShiShen2() != null && list.get(i).getShiShen2().contains("食神")) || (list.get(i).getShiShen3() != null && list.get(i).getShiShen3().contains("食神"))) {
+            if ("酉".equals(list.get(i).getName()) &&
+                    ((list.get(i).getShiShen1() != null && list.get(i).getShiShen1().contains("食神"))
+                            ||
+                            (list.get(i).getShiShen2() != null && list.get(i).getShiShen2().contains("食神"))
+                            ||
+                            (list.get(i).getShiShen3() != null && list.get(i).getShiShen3().contains("食神")))) {
                 sing = true;
             }
         }
         if (sing) {
             System.out.println("你在唱歌方面表现出色，嗓音优美动人，超越了一般水平。");
-            guo3GuanMap.put(x++,"你在唱歌方面表现出色，嗓音优美动人，超越了一般水平。");
+            guo3GuanMap.put(x++, "你在唱歌方面表现出色，嗓音优美动人，超越了一般水平。");
         }
 
 
         //13.庚金暴力
         StringBuffer genContent = new StringBuffer();
-        genContent.append("以下单纯是指暴力，脾气可能还不错。真发火时可能会动手。");
         if (list.get(2).getName().equals("庚")) {
             genContent.append("父亲比较有暴力倾向，可能有对母亲动手过。");
         }
@@ -1375,9 +1388,9 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
                 genContent.append("你的老公比较暴力，可能对你家暴。");
             }
         }
-        if(genContent.toString().length()>0) {
-            System.out.println(genContent.toString());
-            guo3GuanMap.put(x++,genContent.toString());
+        if (genContent.toString().length() > 0) {
+            genContent.insert(0, "较暴力，真发火时可能会动手。");
+            guo3GuanMap.put(x++, genContent.toString());
         }
 
 
@@ -1409,14 +1422,19 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
         if (bi == true && cai == true) {
             //性别
             if (list.get(4).getShiShen1().contains("男")) {
-                System.out.println("大概率跟老婆（过去或未来）在一个公司或单位，一起工作过。");
-                guo3GuanMap.put(x++,"大概率跟老婆（过去或未来）在一个公司或单位，一起工作过。");
+                guo3GuanMap.put(x++, "大概率跟老婆在一个公司或单位，一起工作过。（过去或未来）");
             } else if (list.get(4).getShiShen1().contains("女")) {
-                System.out.println("大概率跟老公（过去或未来）在一个公司或单位，一起工作过。");
-                guo3GuanMap.put(x++,"大概率跟老婆（过去或未来）在一个公司或单位，一起工作过。");
+                guo3GuanMap.put(x++, "大概率跟老婆在一个公司或单位，一起工作过。（过去或未来）");
             }
         }
 
+        String dayZhu = list.get(4).getName() + list.get(5).getName();
+        if (dayZhu.equals("甲辰") || dayZhu.equals("乙巳") || dayZhu.equals("丙申") || dayZhu.equals("丁亥") || dayZhu.equals("庚辰")
+                || dayZhu.equals("戊戌") || dayZhu.equals("癸亥") || dayZhu.equals("辛巳") || dayZhu.equals("壬申") || dayZhu.equals("己丑")
+        ) {
+            guo3GuanMap.put(x++, "十恶大败日生人，入不敷出，花钱多，进钱少。可能欠有银行贷款等外债。");
+        }
+
         return guo3GuanMap;
     }