十神性格

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

@@ -81,10 +81,11 @@ public class GanZhiController extends BaseController {
         ganZhiDaYunVo = ganZhiService.getDaYun(ganZhiDto,ganZhiDaYunVo); //月柱节气矫正 取出90年大运
         List<GanZhiRowVo> ganZhiRowVoList = ganZhiService.selectGanZhiRowVoList(ganZhiDto);
         Map<String, Object> riYuanQrMap = ganZhiService.getRiYuanQr(ganZhiRowVoList);  //查出日元强弱
-
         String xifangWei = ganZhiService.getXiFangWei(ganZhiDaYunVo.getLunar());
 
 
+        Map<String,String> industryMap = ganZhiService.getIndustry(riYuanQrMap);
+
 
         int maxTianGan = ganZhiService.getMaxTianGan(ganZhiDto);  //最出能量最强的天干
         Map<String,String> geJuMap = ganZhiService.getGeJu(ganZhiRowVoList,maxTianGan,riYuanQrMap.get("qr").toString()); //查出八字常见格局
@@ -92,7 +93,7 @@ public class GanZhiController extends BaseController {
         Map<Integer,String> guoGuanMap = ganZhiService.getGuo3Guan(ganZhiRowVoList,riYuanQrMap.get("qr").toString());
 
         Map<String, Integer> fiveCountMap = ganZhiService.getGanZhiRowVoCount(ganZhiRowVoList);
-        Map<String, Integer> shiShenCountMap = ganZhiService.getShiShenCount(ganZhiRowVoList);
+        Map<String, Object> shiShenCountMap = ganZhiService.getShiShenCount(ganZhiRowVoList);
         List<GanZhiNaYinVo> ganZhiNaYinVoList = ganZhiService.selectGanZhiNaYinList(ganZhiDto);
         List<GanZhiKongWangVo> ganZhiKongWangVoList = ganZhiService.selectGanZhiKongWangList(ganZhiDto);
         Map<String, Object> numberYunMap = ganZhiService.getNumberYun(riYuanQrMap);

xpgx-common/src/main/java/com/miaxis/common/config/ShiShenConfig.java

@@ -83,6 +83,12 @@ public class ShiShenConfig {
     //十神缺失
     private Map<String,String> zeroShiShen = new TreeMap<String,String>();
 
+    //五行与行业
+    private Map<String,String> fiveIndustry = new TreeMap<String,String>();
+
+    //十神与行业
+    private Map<String,String> shiShenIndustry = new TreeMap<String,String>();
+
     @PostConstruct
     public void init() {
 
@@ -799,6 +805,25 @@ public class ShiShenConfig {
         zeroShiShen.put("比肩", "缺少比肩，朋友少，性格孤僻，有点社交恐惧症");
 
 
+        //五行与行业
+        fiveIndustry.put("木","事业属性与木有直接或间接关联者，五行便属木。如：木制业、家具业、木材行、室内设计业、纸业、花业、园艺店、树苗盆栽业、医药医疗事业。文化事业、教育用品业、出版业、公务员、政界、安亲班、补习班、训练机构、宗教用品、画廊、装潢材料业、精品店、水果业、食品制造业、人才培育事业、布业、服饰业、窗帘业、茶叶行、栽种业、休闲农场等。");
+        fiveIndustry.put("火","事业属性与热度和光线有关的所有行业，五行便属火。如 : 加工修理业、灯光照明事业、灯具厨具业、高热或易燃物品事业、加油站、石油酒精业、瓦斯行、热食饮食业、理发美容业、化妆品业、雕刻业、心理学家、演说家、歌舞戏剧表演业、印制品业、服饰店、面包店、窑业、陶瓷店、照相馆、光学仪器行等。");
+        fiveIndustry.put("土","事业属性与土地、稳固、信赖有关的所有行业，五行便属土。如：农产品业、食品加工业、畜牧业、宠物店、饲料业、大理石业、砂石业、土地开发业、水泥建筑业、房屋中介业、当铺古董业、殡葬业、农具行、古物珠宝鉴定业、会计师、律师法官、代书、医师、设计人员、顾问代理商标业、垃圾清理掩埋、病虫害防治业、 资源回收业等。");
+        fiveIndustry.put("金","事业属性与金有直接或间接关联者，五行便属金。如：五金商、矿产业、汽车业、交通业、机车行、货运快递业、金融业、车料制造业、珠宝业、工具机械业、电子业、电器业、仪器制造业、钟表业、电机制造业、电缆业、电讯业、通讯器材业、网络业、资讯业、铸造业、铁窗业、金属饰品业、银楼、锁店、武术馆、保全业、屠宰业、民意代表、大法官、属于铁或金属的材料工具业或买卖或制造业等。");
+        fiveIndustry.put("水","事业属性为奔波、漂游、流动或与水有直接或间接关系的所有行业，五行便属水。如 : 服务业、人力中介业、婚姻交友中心、征信社、化学用品业、雨衣雨鞋制造业、旅游业、旅馆业、特技表演业、记者、航海业、水产业、冷冻冷藏业、洗衣业、渔具业、钓虾场、游泳池、制酒业、酒吧、消防器材业、咖啡屋、饮料业、染料业传播业、娱乐业、清洁消毒业等。");
+
+
+        //十神与行业
+        shiShenIndustry.put("正财","您为正财格则适合从事公职工作，就是上班打工求财。这种八字如果做生意，也只能开门市，从事一些稳定的行业，不合适投机的项目。依靠稳定的工作收入。");
+        shiShenIndustry.put("偏财","您为偏财格则适合创业做老板，另外分析八字组合。食神旺，是交际型，靠交友得到商机求财。伤官旺，是靠自己型，有独特的技能，或者靠体力求财。依靠不停的折腾成功。");
+        shiShenIndustry.put("正印","适合服务行业，幼师，导游，护士，文化，教育，书法，写作记录文职。依靠付出爱心的工作。");
+        shiShenIndustry.put("偏印","适合做顾问，分析师，设计师，作家，音乐家，心理学家，参谋，下棋，秘书。依靠脑力分析的工作。");
+        shiShenIndustry.put("食神","适合做事餐饮业，也适合当文学家，艺术，艺术家，音乐家，美学专家，艺术鉴赏家，经济学家。依靠演艺和艺术方面比较容易成功。");
+        shiShenIndustry.put("伤官","很聪明，头脑都相当好，但是兴趣多却不精通，性格傲慢，好胜，卖弄，张扬说话带刺，不招人喜欢。适合做歌唱，影视演艺，卖艺，马戏难耍，特技运动，考古探险等。依靠一项专精的技艺比较容易成功。");
+        shiShenIndustry.put("正官","公正、 廉洁，一生正气，人品质高尚，有领导才能爱操心，受人尊敬适合做公务员，团队领导，公司中高层。依靠管理事务的工作。");
+        shiShenIndustry.put("七杀","适合做公检法执法单位，二把手，有杀气的行业依靠找个人辅佐的工作。");
+
+
 
     }
 

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

@@ -70,7 +70,7 @@ public interface IGanZhiService extends IService<GanZhi>{
      * @param ganZhiRowVoList
      * @return
      */
-    Map<String, Integer> getShiShenCount(List<GanZhiRowVo> ganZhiRowVoList);
+    Map<String, Object> getShiShenCount(List<GanZhiRowVo> ganZhiRowVoList);
 
     /**
      * 潮湿平衡
@@ -106,4 +106,6 @@ public interface IGanZhiService extends IService<GanZhi>{
     Map<Integer, String> getGuo3Guan(List<GanZhiRowVo> list, String qr);
 
     String getXiFangWei(Lunar lunar);
+
+    Map<String, String> getIndustry(Map<String, Object> riYuanQrMap);
 }

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

@@ -938,9 +938,8 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
      * @return
      */
     @Override
-    public Map<String, Integer> getShiShenCount(List<GanZhiRowVo> list) {
-
-        Map<String, Integer> shiShenCount = new TreeMap<String, Integer>();
+    public Map<String, Object> getShiShenCount(List<GanZhiRowVo> list) {
+        Map<String, Object> shiShenCount = new TreeMap<String, Object>();
         shiShenCount.put("正印", 0);
         shiShenCount.put("食神", 0);
         shiShenCount.put("正官", 0);
@@ -958,153 +957,153 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
             String shiShen3 = list.get(i).getShiShen3();
             //正印
             if (shiShen1 != null && shiShen1.contains("正印")) {
-                Integer count = shiShenCount.get("正印") + 1;
+                Integer count = (Integer)shiShenCount.get("正印") + 1;
                 shiShenCount.put("正印", count);
             }
             if (shiShen2 != null && shiShen2.contains("正印")) {
-                Integer count = shiShenCount.get("正印") + 1;
+                Integer count = (Integer)shiShenCount.get("正印") + 1;
                 shiShenCount.put("正印", count);
             }
             if (shiShen3 != null && shiShen3.contains("正印")) {
-                Integer count = shiShenCount.get("正印") + 1;
+                Integer count = (Integer)shiShenCount.get("正印") + 1;
                 shiShenCount.put("正印", count);
             }
             //食神
             if (shiShen1 != null && shiShen1.contains("食神")) {
-                Integer count = shiShenCount.get("食神") + 1;
+                Integer count = (Integer)shiShenCount.get("食神") + 1;
                 shiShenCount.put("食神", count);
             }
             if (shiShen2 != null && shiShen2.contains("食神")) {
-                Integer count = shiShenCount.get("食神") + 1;
+                Integer count = (Integer)shiShenCount.get("食神") + 1;
                 shiShenCount.put("食神", count);
             }
             if (shiShen3 != null && shiShen3.contains("食神")) {
-                Integer count = shiShenCount.get("食神") + 1;
+                Integer count = (Integer)shiShenCount.get("食神") + 1;
                 shiShenCount.put("食神", count);
             }
 
             //正官
             if (shiShen1 != null && shiShen1.contains("正官")) {
-                Integer count = shiShenCount.get("正官") + 1;
+                Integer count = (Integer)shiShenCount.get("正官") + 1;
                 shiShenCount.put("正官", count);
             }
             if (shiShen2 != null && shiShen2.contains("正官")) {
-                Integer count = shiShenCount.get("正官") + 1;
+                Integer count = (Integer)shiShenCount.get("正官") + 1;
                 shiShenCount.put("正官", count);
             }
             if (shiShen3 != null && shiShen3.contains("正官")) {
-                Integer count = shiShenCount.get("正官") + 1;
+                Integer count = (Integer)shiShenCount.get("正官") + 1;
                 shiShenCount.put("正官", count);
             }
 
             //正财
             if (shiShen1 != null && shiShen1.contains("正财")) {
-                Integer count = shiShenCount.get("正财") + 1;
+                Integer count = (Integer)shiShenCount.get("正财") + 1;
                 shiShenCount.put("正财", count);
             }
             if (shiShen2 != null && shiShen2.contains("正财")) {
-                Integer count = shiShenCount.get("正财") + 1;
+                Integer count = (Integer)shiShenCount.get("正财") + 1;
                 shiShenCount.put("正财", count);
             }
             if (shiShen3 != null && shiShen3.contains("正财")) {
-                Integer count = shiShenCount.get("正财") + 1;
+                Integer count = (Integer)shiShenCount.get("正财") + 1;
                 shiShenCount.put("正财", count);
             }
 
             //七杀
             if (shiShen1 != null && shiShen1.contains("七杀")) {
-                Integer count = shiShenCount.get("七杀") + 1;
+                Integer count = (Integer)shiShenCount.get("七杀") + 1;
                 shiShenCount.put("七杀", count);
             }
             if (shiShen2 != null && shiShen2.contains("七杀")) {
-                Integer count = shiShenCount.get("七杀") + 1;
+                Integer count = (Integer)shiShenCount.get("七杀") + 1;
                 shiShenCount.put("七杀", count);
             }
             if (shiShen3 != null && shiShen3.contains("七杀")) {
-                Integer count = shiShenCount.get("七杀") + 1;
+                Integer count = (Integer)shiShenCount.get("七杀") + 1;
                 shiShenCount.put("七杀", count);
             }
 
             //偏印
             if (shiShen1 != null && shiShen1.contains("偏印")) {
-                Integer count = shiShenCount.get("偏印") + 1;
+                Integer count = (Integer)shiShenCount.get("偏印") + 1;
                 shiShenCount.put("偏印", count);
             }
             if (shiShen2 != null && shiShen2.contains("偏印")) {
-                Integer count = shiShenCount.get("偏印") + 1;
+                Integer count = (Integer)shiShenCount.get("偏印") + 1;
                 shiShenCount.put("偏印", count);
             }
             if (shiShen3 != null && shiShen3.contains("偏印")) {
-                Integer count = shiShenCount.get("偏印") + 1;
+                Integer count = (Integer)shiShenCount.get("偏印") + 1;
                 shiShenCount.put("偏印", count);
             }
 
             //偏财
             if (shiShen1 != null && shiShen1.contains("偏财")) {
-                Integer count = shiShenCount.get("偏财") + 1;
+                Integer count = (Integer)shiShenCount.get("偏财") + 1;
                 shiShenCount.put("偏财", count);
             }
             if (shiShen2 != null && shiShen2.contains("偏财")) {
-                Integer count = shiShenCount.get("偏财") + 1;
+                Integer count = (Integer)shiShenCount.get("偏财") + 1;
                 shiShenCount.put("偏财", count);
             }
             if (shiShen3 != null && shiShen3.contains("偏财")) {
-                Integer count = shiShenCount.get("偏财") + 1;
+                Integer count = (Integer)shiShenCount.get("偏财") + 1;
                 shiShenCount.put("偏财", count);
             }
 
             //伤官
             if (shiShen1 != null && shiShen1.contains("伤官")) {
-                Integer count = shiShenCount.get("伤官") + 1;
+                Integer count = (Integer)shiShenCount.get("伤官") + 1;
                 shiShenCount.put("伤官", count);
             }
             if (shiShen2 != null && shiShen2.contains("伤官")) {
-                Integer count = shiShenCount.get("伤官") + 1;
+                Integer count = (Integer)shiShenCount.get("伤官") + 1;
                 shiShenCount.put("伤官", count);
             }
             if (shiShen3 != null && shiShen3.contains("伤官")) {
-                Integer count = shiShenCount.get("伤官") + 1;
+                Integer count = (Integer)shiShenCount.get("伤官") + 1;
                 shiShenCount.put("伤官", count);
             }
 
             //劫财
             if (shiShen1 != null && shiShen1.contains("劫财")) {
-                Integer count = shiShenCount.get("劫财") + 1;
+                Integer count = (Integer)shiShenCount.get("劫财") + 1;
                 shiShenCount.put("劫财", count);
             }
             if (shiShen2 != null && shiShen2.contains("劫财")) {
-                Integer count = shiShenCount.get("劫财") + 1;
+                Integer count = (Integer)shiShenCount.get("劫财") + 1;
                 shiShenCount.put("劫财", count);
             }
             if (shiShen3 != null && shiShen3.contains("劫财")) {
-                Integer count = shiShenCount.get("劫财") + 1;
+                Integer count = (Integer)shiShenCount.get("劫财") + 1;
                 shiShenCount.put("劫财", count);
             }
 
             //比肩
             if (shiShen1 != null && shiShen1.contains("比肩")) {
-                Integer count = shiShenCount.get("比肩") + 1;
+                Integer count = (Integer)shiShenCount.get("比肩") + 1;
                 shiShenCount.put("比肩", count);
             }
             if (shiShen2 != null && shiShen2.contains("比肩")) {
-                Integer count = shiShenCount.get("比肩") + 1;
+                Integer count = (Integer)shiShenCount.get("比肩") + 1;
                 shiShenCount.put("比肩", count);
             }
             if (shiShen3 != null && shiShen3.contains("比肩")) {
-                Integer count = shiShenCount.get("比肩") + 1;
+                Integer count = (Integer)shiShenCount.get("比肩") + 1;
                 shiShenCount.put("比肩", count);
             }
 
         }
         StringBuffer zeroCotent = new StringBuffer();
         shiShenCount.forEach((key, value) -> {
-            if (value == 0) {
+            if (value instanceof Integer && (Integer) value == 0) {
                 zeroCotent.append(shiShenConfig.getZeroShiShen().get(key));
                 zeroCotent.append(";");
             }
         });
-        System.out.println(zeroCotent.toString());
-
+        zeroCotent.deleteCharAt(zeroCotent.length() - 1);
+        shiShenCount.put("缺失十神评语",zeroCotent.toString());
         return shiShenCount;
     }
 
@@ -1639,22 +1638,27 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
         String[] s = str.split(" ");
         StringBuffer fangWei = new StringBuffer();
 
-        System.out.println(str);
         str = str.substring(str.indexOf("喜神方位"));
 
         System.out.println(str);
 
-        fangWei.append(s[14]).append(";");
-        fangWei.append(s[15]).append(";");
-        fangWei.append(s[16]).append(";");
-        fangWei.append(s[17]).append(";");
-        fangWei.append(s[18]).append(";");
-        fangWei.append(s[19]).append(";");
-        fangWei.append(s[20]);
-        System.out.println(fangWei.toString());
         return str;
 
     }
 
 
+    @Override
+    public Map<String, String> getIndustry(Map<String, Object> riYuanQrMap) {
+
+        List<String> xiYongList = (List)riYuanQrMap.get("xiYong");
+        System.out.println(xiYongList);
+
+        for (int i = 0; i < xiYongList.size(); i++) {
+            xiYongList.get(i);
+        }
+        
+        return null;
+    }
+
+
 }

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

@@ -56,7 +56,7 @@ public class GanZhiVo {
     private Map<String,Integer> fiveCountMap;
 
     @ApiModelProperty(value = "八字十神个数集合")
-    private Map<String,Integer> shiShenCountMap;
+    private Map<String,Object> shiShenCountMap;
 
     @ApiModelProperty(value = "八字燥湿集合")
     private Map<String,Object> zaoShiMap;