十神性格

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

@@ -65,6 +65,14 @@ public class GanZhiController extends BaseController {
         ganZhiDaYunVo.setLunar(lunar);
         System.out.println("农历：" + lunar.getYear() + "年(生肖" + lunar.getYearShengXiao() + ")" + lunar.getMonth() + "月" + lunar.getDay() + "日" + lunar.getTime() + "时");
 
+
+        System.out.println(lunar.getYear());   //年
+        System.out.println(lunar.getMonth());   //月
+        System.out.println(lunar.getDay());     //日
+        String time = lunar.getTime().toString().substring(lunar.getTime().toString().length() - 1); //时
+        System.out.println(time);
+
+
         // 获取干支纪年
         ganZhiDto.setYearGan(lunar.getYearGan());
         ganZhiDto.setYearZhi(lunar.getYearZhi());
@@ -81,14 +89,18 @@ 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());
+        String xifangWei = ganZhiService.getXiFangWei(ganZhiDaYunVo.getLunar()); //喜用的方位
+        Map<String, Object> chenGuMap = ganZhiService.getChenGu(ganZhiDaYunVo.getLunar());
 
 
-        Map<String,String> industryMap = ganZhiService.getIndustry(riYuanQrMap);
+        String guiren = ganZhiService.getGuiren(ganZhiRowVoList);
 
 
         int maxTianGan = ganZhiService.getMaxTianGan(ganZhiDto);  //最出能量最强的天干
         Map<String,String> geJuMap = ganZhiService.getGeJu(ganZhiRowVoList,maxTianGan,riYuanQrMap.get("qr").toString()); //查出八字常见格局
+        String geju = geJuMap.get("geju");
+
+        String industry = ganZhiService.getIndustry(riYuanQrMap,geju);
 
         Map<Integer,String> guoGuanMap = ganZhiService.getGuo3Guan(ganZhiRowVoList,riYuanQrMap.get("qr").toString());
 
@@ -119,6 +131,8 @@ public class GanZhiController extends BaseController {
         ganZhiVo.setGeJuMap(geJuMap);
         ganZhiVo.setGuoGuanMap(guoGuanMap);
         ganZhiVo.setXiFangWei(xifangWei);
+        ganZhiVo.setIndustry(industry);
+        ganZhiVo.setGuiren(guiren);
 
         // 输出结果
         return Response.success(ganZhiVo);

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

@@ -75,72 +75,87 @@ public class ShiShenConfig {
     private Map<String, String> tianGanYY = new TreeMap<String, String>();
 
     //八字身体位置坐标
-    private Map<Integer,String> body = new TreeMap<Integer,String>();
+    private Map<Integer, String> body = new TreeMap<Integer, String>();
 
     //八字方位位置坐标
-    private Map<Integer,String> position = new TreeMap<Integer,String>();
+    private Map<Integer, String> position = new TreeMap<Integer, String>();
 
     //十神缺失
-    private Map<String,String> zeroShiShen = new TreeMap<String,String>();
+    private Map<String, String> zeroShiShen = new TreeMap<String, String>();
 
     //五行与行业
-    private Map<String,String> fiveIndustry = new TreeMap<String,String>();
+    private Map<String, String> fiveIndustry = new TreeMap<String, String>();
 
     //十神与行业
-    private Map<String,String> shiShenIndustry = new TreeMap<String,String>();
+    private Map<String, String> shiShenIndustry = new TreeMap<String, String>();
+
+    //天乙贵人
+    private Map<String, String> tianyiGuiren = new TreeMap<String, String>();
+
+    //天乙贵人 生肖
+    private Map<String, String> tianyiGuirenShengXiao = new TreeMap<String, String>();
+
+    //袁天罡骨算命
+    private Map<String, Integer> guZhong = new TreeMap<String, Integer>();
+
+    //袁天罡骨算命评语（男）
+    private Map<String, String> guZhongPingYuMan = new TreeMap<String, String>();
+
+    //袁天罡骨算命评语（女）
+    private Map<String, String> guZhongPingYuWoman = new TreeMap<String, String>();
 
     @PostConstruct
     public void init() {
 
         //天干地支颜色
-        ganZhiColor.put("甲","绿");
-        ganZhiColor.put("乙","绿");
-        ganZhiColor.put("丙","红");
-        ganZhiColor.put("丁","红");
-        ganZhiColor.put("戊","棕");
-        ganZhiColor.put("己","棕");
-        ganZhiColor.put("庚","橙");
-        ganZhiColor.put("辛","橙");
-        ganZhiColor.put("壬","蓝");
-        ganZhiColor.put("癸","蓝");
-
-        ganZhiColor.put("子","蓝");
-        ganZhiColor.put("丑","棕");
-        ganZhiColor.put("寅","绿");
-        ganZhiColor.put("卯","绿");
-        ganZhiColor.put("辰","棕");
-        ganZhiColor.put("巳","红");
-        ganZhiColor.put("午","红");
-        ganZhiColor.put("未","棕");
-        ganZhiColor.put("申","橙");
-        ganZhiColor.put("酉","橙");
-        ganZhiColor.put("戌","棕");
-        ganZhiColor.put("亥","蓝");
+        ganZhiColor.put("甲", "绿");
+        ganZhiColor.put("乙", "绿");
+        ganZhiColor.put("丙", "红");
+        ganZhiColor.put("丁", "红");
+        ganZhiColor.put("戊", "棕");
+        ganZhiColor.put("己", "棕");
+        ganZhiColor.put("庚", "橙");
+        ganZhiColor.put("辛", "橙");
+        ganZhiColor.put("壬", "蓝");
+        ganZhiColor.put("癸", "蓝");
+
+        ganZhiColor.put("子", "蓝");
+        ganZhiColor.put("丑", "棕");
+        ganZhiColor.put("寅", "绿");
+        ganZhiColor.put("卯", "绿");
+        ganZhiColor.put("辰", "棕");
+        ganZhiColor.put("巳", "红");
+        ganZhiColor.put("午", "红");
+        ganZhiColor.put("未", "棕");
+        ganZhiColor.put("申", "橙");
+        ganZhiColor.put("酉", "橙");
+        ganZhiColor.put("戌", "棕");
+        ganZhiColor.put("亥", "蓝");
 
         //天干地支五行
-        ganZhiFive.put("甲","木");
-        ganZhiFive.put("乙","木");
-        ganZhiFive.put("丙","火");
-        ganZhiFive.put("丁","火");
-        ganZhiFive.put("戊","土");
-        ganZhiFive.put("己","土");
-        ganZhiFive.put("庚","金");
-        ganZhiFive.put("辛","金");
-        ganZhiFive.put("壬","水");
-        ganZhiFive.put("癸","水");
-
-        ganZhiFive.put("子","水");
-        ganZhiFive.put("丑","土");
-        ganZhiFive.put("寅","木");
-        ganZhiFive.put("卯","木");
-        ganZhiFive.put("辰","土");
-        ganZhiFive.put("巳","火");
-        ganZhiFive.put("午","火");
-        ganZhiFive.put("未","土");
-        ganZhiFive.put("申","金");
-        ganZhiFive.put("酉","金");
-        ganZhiFive.put("戌","土");
-        ganZhiFive.put("亥","水");
+        ganZhiFive.put("甲", "木");
+        ganZhiFive.put("乙", "木");
+        ganZhiFive.put("丙", "火");
+        ganZhiFive.put("丁", "火");
+        ganZhiFive.put("戊", "土");
+        ganZhiFive.put("己", "土");
+        ganZhiFive.put("庚", "金");
+        ganZhiFive.put("辛", "金");
+        ganZhiFive.put("壬", "水");
+        ganZhiFive.put("癸", "水");
+
+        ganZhiFive.put("子", "水");
+        ganZhiFive.put("丑", "土");
+        ganZhiFive.put("寅", "木");
+        ganZhiFive.put("卯", "木");
+        ganZhiFive.put("辰", "土");
+        ganZhiFive.put("巳", "火");
+        ganZhiFive.put("午", "火");
+        ganZhiFive.put("未", "土");
+        ganZhiFive.put("申", "金");
+        ganZhiFive.put("酉", "金");
+        ganZhiFive.put("戌", "土");
+        ganZhiFive.put("亥", "水");
 
         //正印
         zhengYin.put("癸", "甲");
@@ -643,154 +658,151 @@ public class ShiShenConfig {
         liushijiazi.add("癸亥");
 
 
-
         //天干阴阳
-        tianGanYY.put("甲","阳");
-        tianGanYY.put("乙","阴");
-        tianGanYY.put("丙","阳");
-        tianGanYY.put("丁","阴");
-        tianGanYY.put("戊","阳");
-        tianGanYY.put("己","阴");
-        tianGanYY.put("庚","阳");
-        tianGanYY.put("辛","阴");
-        tianGanYY.put("壬","阳");
-        tianGanYY.put("癸","阴");
-
-
+        tianGanYY.put("甲", "阳");
+        tianGanYY.put("乙", "阴");
+        tianGanYY.put("丙", "阳");
+        tianGanYY.put("丁", "阴");
+        tianGanYY.put("戊", "阳");
+        tianGanYY.put("己", "阴");
+        tianGanYY.put("庚", "阳");
+        tianGanYY.put("辛", "阴");
+        tianGanYY.put("壬", "阳");
+        tianGanYY.put("癸", "阴");
 
 
         //喜用
         List<String> muQ = new ArrayList<String>();
         muQ.add("火");
         muQ.add("土");
-        xiYong.put("木强",muQ);
+        xiYong.put("木强", muQ);
 
         List<String> muR = new ArrayList<String>();
         muR.add("木");
         muR.add("水");
-        xiYong.put("木弱",muR);
+        xiYong.put("木弱", muR);
 
         List<String> huoQ = new ArrayList<String>();
         huoQ.add("土");
         huoQ.add("金");
-        xiYong.put("火强",huoQ);
+        xiYong.put("火强", huoQ);
 
         List<String> huoR = new ArrayList<String>();
         huoR.add("火");
         huoR.add("木");
-        xiYong.put("火弱",huoR);
+        xiYong.put("火弱", huoR);
 
         List<String> tuQ = new ArrayList<String>();
         tuQ.add("金");
         tuQ.add("水");
-        xiYong.put("土强",tuQ);
+        xiYong.put("土强", tuQ);
 
         List<String> tuR = new ArrayList<String>();
         tuR.add("土");
         tuR.add("火");
-        xiYong.put("土弱",tuR);
+        xiYong.put("土弱", tuR);
 
         List<String> jinQ = new ArrayList<String>();
         jinQ.add("水");
         jinQ.add("木");
-        xiYong.put("金强",jinQ);
+        xiYong.put("金强", jinQ);
 
         List<String> jinR = new ArrayList<String>();
         jinR.add("金");
         jinR.add("土");
-        xiYong.put("金弱",jinR);
+        xiYong.put("金弱", jinR);
 
         List<String> shuiQ = new ArrayList<String>();
         shuiQ.add("木");
         shuiQ.add("火");
-        xiYong.put("水强",shuiQ);
+        xiYong.put("水强", shuiQ);
 
         List<String> shuiR = new ArrayList<String>();
         shuiR.add("水");
         shuiR.add("金");
-        xiYong.put("水弱",shuiR);
+        xiYong.put("水弱", shuiR);
 
         //喜用的号码
         List<String> numberShui = new ArrayList<String>();
         numberShui.add("1");
         numberShui.add("6");
-        xiNumber.put("水",numberShui);
+        xiNumber.put("水", numberShui);
 
         List<String> numberHuo = new ArrayList<String>();
         numberHuo.add("2");
         numberHuo.add("7");
-        xiNumber.put("火",numberHuo);
+        xiNumber.put("火", numberHuo);
 
         List<String> numberMu = new ArrayList<String>();
         numberMu.add("3");
         numberMu.add("8");
-        xiNumber.put("木",numberMu);
+        xiNumber.put("木", numberMu);
 
         List<String> numberJin = new ArrayList<String>();
         numberJin.add("4");
         numberJin.add("9");
-        xiNumber.put("金",numberJin);
+        xiNumber.put("金", numberJin);
 
         List<String> numberTu = new ArrayList<String>();
         numberTu.add("5");
         numberTu.add("0");
-        xiNumber.put("土",numberTu);
+        xiNumber.put("土", numberTu);
 
 
         //五行对应身体部位
         List<String> shuiBuWei = new ArrayList<String>();
         shuiBuWei.add("肾");
         shuiBuWei.add("膀胱");
-        fiveBuWei.put("水",shuiBuWei);
+        fiveBuWei.put("水", shuiBuWei);
 
         List<String> huoBuWei = new ArrayList<String>();
         huoBuWei.add("小肠");
         huoBuWei.add("心脏");
-        fiveBuWei.put("火",huoBuWei);
+        fiveBuWei.put("火", huoBuWei);
 
         List<String> muBuWei = new ArrayList<String>();
         muBuWei.add("肝");
         muBuWei.add("胆");
-        fiveBuWei.put("木",muBuWei);
+        fiveBuWei.put("木", muBuWei);
 
         List<String> jinBuWei = new ArrayList<String>();
         jinBuWei.add("大肠");
         jinBuWei.add("肺");
-        fiveBuWei.put("金",jinBuWei);
+        fiveBuWei.put("金", jinBuWei);
 
         List<String> tuBuWei = new ArrayList<String>();
         tuBuWei.add("脾");
         tuBuWei.add("胃");
-        fiveBuWei.put("土",tuBuWei);
+        fiveBuWei.put("土", tuBuWei);
 
 
         //燥湿平衡
-        zaoShi.put("辰","水");
-        zaoShi.put("丑","水");
-        zaoShi.put("未","火");
-        zaoShi.put("戌","火");
+        zaoShi.put("辰", "水");
+        zaoShi.put("丑", "水");
+        zaoShi.put("未", "火");
+        zaoShi.put("戌", "火");
 
 
         //身体位置坐标
-        body.put(0,"头部");
-        body.put(1,"脖子");
-        body.put(2,"胸部至背部");
-        body.put(3,"腹部至下背部");
-        body.put(4,"小腹至后腰");
-        body.put(5,"胯部到屁股");
-        body.put(6,"大腿");
-        body.put(7,"小腿至脚部");
+        body.put(0, "头部");
+        body.put(1, "脖子");
+        body.put(2, "胸部至背部");
+        body.put(3, "腹部至下背部");
+        body.put(4, "小腹至后腰");
+        body.put(5, "胯部到屁股");
+        body.put(6, "大腿");
+        body.put(7, "小腿至脚部");
 
 
         //方位位置坐标
-        position.put(0,"东南方");
-        position.put(1,"东北方");
-        position.put(2,"南方");
-        position.put(3,"北方");
-        position.put(4,"南方");
-        position.put(5,"北方");
-        position.put(6,"西南方");
-        position.put(7,"西北方");
+        position.put(0, "东南方");
+        position.put(1, "东北方");
+        position.put(2, "南方");
+        position.put(3, "北方");
+        position.put(4, "南方");
+        position.put(5, "北方");
+        position.put(6, "西南方");
+        position.put(7, "西北方");
 
         //缺失十神的性格
         zeroShiShen.put("正印", "缺少正印，记忆力不太好");
@@ -806,30 +818,288 @@ public class ShiShenConfig {
 
 
         //五行与行业
-        fiveIndustry.put("木","事业属性与木有直接或间接关联者，五行便属木。如：木制业、家具业、木材行、室内设计业、纸业、花业、园艺店、树苗盆栽业、医药医疗事业。文化事业、教育用品业、出版业、公务员、政界、安亲班、补习班、训练机构、宗教用品、画廊、装潢材料业、精品店、水果业、食品制造业、人才培育事业、布业、服饰业、窗帘业、茶叶行、栽种业、休闲农场等。");
-        fiveIndustry.put("火","事业属性与热度和光线有关的所有行业，五行便属火。如 : 加工修理业、灯光照明事业、灯具厨具业、高热或易燃物品事业、加油站、石油酒精业、瓦斯行、热食饮食业、理发美容业、化妆品业、雕刻业、心理学家、演说家、歌舞戏剧表演业、印制品业、服饰店、面包店、窑业、陶瓷店、照相馆、光学仪器行等。");
-        fiveIndustry.put("土","事业属性与土地、稳固、信赖有关的所有行业，五行便属土。如：农产品业、食品加工业、畜牧业、宠物店、饲料业、大理石业、砂石业、土地开发业、水泥建筑业、房屋中介业、当铺古董业、殡葬业、农具行、古物珠宝鉴定业、会计师、律师法官、代书、医师、设计人员、顾问代理商标业、垃圾清理掩埋、病虫害防治业、 资源回收业等。");
-        fiveIndustry.put("金","事业属性与金有直接或间接关联者，五行便属金。如：五金商、矿产业、汽车业、交通业、机车行、货运快递业、金融业、车料制造业、珠宝业、工具机械业、电子业、电器业、仪器制造业、钟表业、电机制造业、电缆业、电讯业、通讯器材业、网络业、资讯业、铸造业、铁窗业、金属饰品业、银楼、锁店、武术馆、保全业、屠宰业、民意代表、大法官、属于铁或金属的材料工具业或买卖或制造业等。");
-        fiveIndustry.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("七杀","适合做公检法执法单位，二把手，有杀气的行业依靠找个人辅佐的工作。");
-
+        shiShenIndustry.put("正财", "您为正财格则适合从事公职工作，就是上班打工求财。这种八字如果做生意，也只能开门市，从事一些稳定的行业，不合适投机的项目。依靠稳定的工作收入。");
+        shiShenIndustry.put("偏财", "您为偏财格则适合创业做老板，另外分析八字组合。食神旺，是交际型，靠交友得到商机求财。伤官旺，是靠自己型，有独特的技能，或者靠体力求财。依靠不停的折腾成功。");
+        shiShenIndustry.put("正印", "适合服务行业，幼师，导游，护士，文化，教育，书法，写作记录文职。依靠付出爱心的工作。");
+        shiShenIndustry.put("偏印", "适合做顾问，分析师，设计师，作家，音乐家，心理学家，参谋，下棋，秘书。依靠脑力分析的工作。");
+        shiShenIndustry.put("食神", "适合做事餐饮业，也适合当文学家，艺术，艺术家，音乐家，美学专家，艺术鉴赏家，经济学家。依靠演艺和艺术方面比较容易成功。");
+        shiShenIndustry.put("伤官", "很聪明，头脑都相当好，但是兴趣多却不精通，性格傲慢，好胜，卖弄，张扬说话带刺，不招人喜欢。适合做歌唱，影视演艺，卖艺，马戏难耍，特技运动，考古探险等。依靠一项专精的技艺比较容易成功。");
+        shiShenIndustry.put("正官", "公正、 廉洁，一生正气，人品质高尚，有领导才能爱操心，受人尊敬适合做公务员，团队领导，公司中高层。依靠管理事务的工作。");
+        shiShenIndustry.put("七杀", "适合做公检法执法单位，二把手，有杀气的行业依靠找个人辅佐的工作。");
+
+        //天乙贵人
+        tianyiGuiren.put("甲", "亥未");
+        tianyiGuiren.put("戊", "亥未");
+        tianyiGuiren.put("乙", "子申");
+        tianyiGuiren.put("己", "子申");
+        tianyiGuiren.put("丙", "亥酉");
+        tianyiGuiren.put("丁", "亥酉");
+        tianyiGuiren.put("壬", "巳卯");
+        tianyiGuiren.put("癸", "巳卯");
+        tianyiGuiren.put("庚", "午寅");
+        tianyiGuiren.put("辛", "午寅");
+
+        //天乙贵人 生肖
+        tianyiGuirenShengXiao.put("甲", "猪羊");
+        tianyiGuirenShengXiao.put("戊", "猪羊");
+        tianyiGuirenShengXiao.put("乙", "鼠猴");
+        tianyiGuirenShengXiao.put("己", "鼠猴");
+        tianyiGuirenShengXiao.put("丙", "猪鸡");
+        tianyiGuirenShengXiao.put("丁", "猪鸡");
+        tianyiGuirenShengXiao.put("壬", "蛇兔");
+        tianyiGuirenShengXiao.put("癸", "蛇兔");
+        tianyiGuirenShengXiao.put("庚", "马虎");
+        tianyiGuirenShengXiao.put("辛", "马虎");
+
+
+        //袁天罡称骨算命
+        guZhong.put("甲子", 12);
+        guZhong.put("丙子", 16);
+        guZhong.put("戊子", 15);
+        guZhong.put("庚子", 7);
+        guZhong.put("壬子", 5);
+
+        guZhong.put("乙丑", 9);
+        guZhong.put("丁丑", 8);
+        guZhong.put("己丑", 7);
+        guZhong.put("辛丑", 7);
+        guZhong.put("癸丑", 7);
+
+        guZhong.put("丙寅", 6);
+        guZhong.put("戊寅", 8);
+        guZhong.put("庚寅", 9);
+        guZhong.put("壬寅", 9);
+        guZhong.put("甲寅", 12);
+
+        guZhong.put("丁卯", 7);
+        guZhong.put("己卯", 19);
+        guZhong.put("辛卯", 12);
+        guZhong.put("癸卯", 12);
+        guZhong.put("乙卯", 8);
+
+        guZhong.put("戊辰", 12);
+        guZhong.put("庚辰", 12);
+        guZhong.put("壬辰", 10);
+        guZhong.put("甲辰", 8);
+        guZhong.put("丙辰", 8);
+
+        guZhong.put("己巳", 5);
+        guZhong.put("辛巳", 6);
+        guZhong.put("癸巳", 7);
+        guZhong.put("乙巳", 7);
+        guZhong.put("丁巳", 6);
+
+        guZhong.put("庚午", 9);
+        guZhong.put("壬午", 8);
+        guZhong.put("甲午", 15);
+        guZhong.put("丙午", 13);
+        guZhong.put("戊午", 19);
+
+        guZhong.put("辛未", 8);
+        guZhong.put("癸未", 7);
+        guZhong.put("乙未", 6);
+        guZhong.put("丁未", 5);
+        guZhong.put("己未", 6);
+
+        guZhong.put("壬申", 7);
+        guZhong.put("甲申", 5);
+        guZhong.put("丙申", 5);
+        guZhong.put("戊申", 14);
+        guZhong.put("庚申", 8);
+
+        guZhong.put("癸酉", 8);
+        guZhong.put("乙酉", 15);
+        guZhong.put("丁酉", 14);
+        guZhong.put("己酉", 5);
+        guZhong.put("辛酉", 16);
+
+        guZhong.put("甲戌", 15);
+        guZhong.put("丙戌", 6);
+        guZhong.put("戊戌", 14);
+        guZhong.put("庚戌", 9);
+        guZhong.put("壬戌", 10);
+
+        guZhong.put("乙亥", 9);
+        guZhong.put("丁亥", 16);
+        guZhong.put("己亥", 9);
+        guZhong.put("辛亥", 17);
+        guZhong.put("癸亥", 6);
+
+        guZhong.put("1月", 6);
+        guZhong.put("2月", 7);
+        guZhong.put("3月", 18);
+        guZhong.put("4月", 9);
+        guZhong.put("5月", 5);
+        guZhong.put("6月", 16);
+        guZhong.put("7月", 9);
+        guZhong.put("8月", 15);
+        guZhong.put("9月", 18);
+        guZhong.put("10月", 8);
+        guZhong.put("11月", 9);
+        guZhong.put("12月", 5);
+
+        guZhong.put("1日", 5);
+        guZhong.put("2日", 10);
+        guZhong.put("3日", 8);
+        guZhong.put("4日", 15);
+        guZhong.put("5日", 16);
+        guZhong.put("6日", 15);
+        guZhong.put("7日", 8);
+        guZhong.put("8日", 16);
+        guZhong.put("9日", 8);
+        guZhong.put("10日", 16);
+        guZhong.put("11日", 9);
+        guZhong.put("12日", 17);
+        guZhong.put("13日", 8);
+        guZhong.put("14日", 17);
+        guZhong.put("15日", 10);
+        guZhong.put("16日", 8);
+        guZhong.put("17日", 9);
+        guZhong.put("18日", 18);
+        guZhong.put("19日", 5);
+        guZhong.put("20日", 10);
+        guZhong.put("21日", 10);
+        guZhong.put("22日", 9);
+        guZhong.put("23日", 8);
+        guZhong.put("24日", 9);
+        guZhong.put("25日", 15);
+        guZhong.put("26日", 18);
+        guZhong.put("27日", 7);
+        guZhong.put("28日", 8);
+        guZhong.put("29日", 16);
+        guZhong.put("30日", 6);
+
+        guZhong.put("子", 16);
+        guZhong.put("丑", 6);
+        guZhong.put("寅", 7);
+        guZhong.put("午", 10);
+        guZhong.put("未", 8);
+        guZhong.put("申", 8);
+        guZhong.put("卯", 10);
+        guZhong.put("辰", 9);
+        guZhong.put("巳", 16);
+        guZhong.put("酉", 9);
+        guZhong.put("戌", 6);
+        guZhong.put("亥", 6);
+
+        //男
+        guZhongPingYuMan.put("21", "此命非业谓大凶，平生灾害事桑重。凶祸频临陷逆境，终世困苦事不成。");
+        guZhongPingYuMan.put("22", "身寒骨冷苦伶仃，此命推来真气人。碌碌巴巴无度日，终年打拱过平年。");
+        guZhongPingYuMan.put("23", "此命推来骨自轻，求谋作事事难成。妻儿兄弟应难许，别处他乡作散人。");
+        guZhongPingYuMan.put("24", "此命推来福禄无，门庭困苦总难营。六亲骨肉皆无靠，流到他乡作老翁。");
+        guZhongPingYuMan.put("25", "此命推来祖业微，门庭营度似稀奇。六亲骨肉如冰炭，一生勤劳自把持。");
+        guZhongPingYuMan.put("26", "平生衣禄苦中求，独自经营事不休。离祖出门宜早计，晚来衣禄自无忧。");
+        guZhongPingYuMan.put("27", "一生作事少商量，难靠祖宗作主张。独马单枪空做去，早来晚岁部无长。");
+        guZhongPingYuMan.put("28", "一生作事似飘蓬，祖宗产业在梦中。若不过房并改姓，也当移徙两三通。");
+        guZhongPingYuMan.put("29", "初年运限未曾享，纵有功名在后底。须过四旬绕可上，移居改姓始为良。");
+        guZhongPingYuMan.put("30", "劳劳碌碌苦中求，东走西奔何日休。若使终身勤与俭，老来稍可免忧愁。");
+        guZhongPingYuMan.put("31", "忙忙碌碌苦中求，何日云开见日头。难得祖基家可立，中年衣食渐无忧。");
+        guZhongPingYuMan.put("32", "初年运蹇事难谋，渐有财源如水流。到得中年衣食旺，那时名利一齐来。");
+        guZhongPingYuMan.put("33", "早年做事事难成，百计徒劳枉费心。半世自如流水去，后来运到得黄金。");
+        guZhongPingYuMan.put("34", "此命福气果如何，僧道门中衣禄多。离祖出家方得妙，终朝拜佛念涌陀。");
+        guZhongPingYuMan.put("35", "平生福量不周全，祖业根基觉少传。营业生涯宜守旧，时来衣食胜从前。");
+        guZhongPingYuMan.put("36", "不须劳碌过平生，独自成家福不轻。早有福星常照命，任君行去百般成。");
+        guZhongPingYuMan.put("37", "此命般般事不成，弟兄少力自孤成。虽然祖业须微有，来得明时去得明。");
+        guZhongPingYuMan.put("38", "一生骨肉最清高，早入黄门姓名标。待看看将三十六，蓝袍脱去换红袍。");
+        guZhongPingYuMan.put("39", "此命终身运不穷，劳劳作事尽皆空。苦心竭力成家计，到得那时在梦中。");
+        guZhongPingYuMan.put("40", "生平衣禄是绵长，件件心中自主张。前面风霜多受过，后来必定享安康。");
+        guZhongPingYuMan.put("41", "此命推来事不同，为人能干略凡庸。中年还有逍遥福，不比前年运未通。");
+        guZhongPingYuMan.put("42", "得宽怀处且宽怀，何用双眉皱不开。若使中年命运济，那时名利一齐来。");
+        guZhongPingYuMan.put("43", "为人心性最聪明，作事轩昂近贵人。衣禄一生天数定，不须劳碌是丰享。");
+        guZhongPingYuMan.put("44", "来事由天莫苦求，须知福禄胜前途。当年财帛难如意，晚景欣然便不忧。");
+        guZhongPingYuMan.put("45", "名利推来竟若何，前途辛苦后奔波。命中难养男与女，骨肉扶持也不多。");
+        guZhongPingYuMan.put("46", "东西南北尽皆空，出姓移名更觉隆。衣禄无亏天数定，中年晚景一般同。");
+        guZhongPingYuMan.put("47", "此命推来旺末年，妻荣子贵自怡然。平生原有滔滔福，可有财源如水源。");
+        guZhongPingYuMan.put("48", "幼年运道未曾享，若是蹉跎再不兴。兄弟六亲皆无靠，一身事业晚年成。");
+        guZhongPingYuMan.put("49", "此命推来福不轻，自成自立耀门庭。从来富贵人亲近，使婢差奴过一生。");
+        guZhongPingYuMan.put("50", "为名为利终日劳，中年福禄也多遭。老来是有财星照，不比前番日下高。");
+        guZhongPingYuMan.put("51", "一世荣华事事通，不须劳碌自享丰。弟兄叔侄皆如意，家业成时福禄宏。");
+        guZhongPingYuMan.put("52", "一世享通事事能，不须劳思自然能。家族欣然心皆好，家业丰享自称心。");
+        guZhongPingYuMan.put("53", "此格推来气像真，兴家发达在其中。一生福禄安排家，欲是人间一富翁。");
+        guZhongPingYuMan.put("54", "此命推来厚且清，诗画满腹看功成。丰衣足食自然稳，正是人间有福人。");
+        guZhongPingYuMan.put("55", "走马扬鞭争名利，少年做事费筹谋。一朝福禄源源至，富贵荣华耀六亲。");
+        guZhongPingYuMan.put("56", "此格推来礼义通，一生福禄用无穷。甜酸苦辣皆尝过，财源滚滚稳且丰。");
+        guZhongPingYuMan.put("57", "福禄丰盈万事全，一生荣耀显双亲。名扬威振人钦敬，处世逍遥似遇春。");
+        guZhongPingYuMan.put("58", "平生福禄自然来，名利双全福禄偕。雁塔题名为贵客，紫袍玉带走金阶。");
+        guZhongPingYuMan.put("59", "细推此格妙且清，必定财高礼义通。甲第之中应有分，扬鞭走马显威荣。");
+        guZhongPingYuMan.put("60", "一朝金榜快题名，显祖荣宗立大功。衣食定然原裕足，田园财帛更丰盛。");
+        guZhongPingYuMan.put("61", "不作朝中金榜客，定为世上一财翁。聪明天赋经书熟，名显高科自是荣。");
+        guZhongPingYuMan.put("62", "此命推来福不穷，读书必定显亲宗。紫衣金带为卿相，富贵荣华皆可同。");
+        guZhongPingYuMan.put("63", "命主为官福禄长，得来富贵定非常。名题雁塔传金榜，定中高科天下扬。");
+        guZhongPingYuMan.put("64", "此格威权不可挡，紫袍金带坐高望。荣华富贵虽能及，积玉堆金满储仓。");
+        guZhongPingYuMan.put("65", "细推此命福不轻，安国安邦极品人。文纷雕梁徽富贵，威声照耀四方闻。");
+        guZhongPingYuMan.put("66", "此格人间一福人，堆金积玉满堂春。从来富贵由天定，正勿垂绅谒圣君。");
+        guZhongPingYuMan.put("67", "此命生来福自宏，田园家业最高隆。平生衣禄丰盈足，一世荣华万事通。");
+        guZhongPingYuMan.put("68", "富贵由大莫苦求，万金家计不须谋。十年不比前番事，祖业根基水上舟。");
+        guZhongPingYuMan.put("69", "君是人间前禄星，一生富贵众人钦。纵然福禄由天定，安享荣华过一生。");
+        guZhongPingYuMan.put("70", "此命推来福不轻，不须愁虑苦劳心。一生天定衣与禄，富贵荣华主一生。");
+        guZhongPingYuMan.put("71", "此命生来大不同，公侯卿相在其中。一生自有逍遥福，富贵荣华极品隆。");
+
+        //女
+        guZhongPingYuWoman.put("21", "");
+        guZhongPingYuWoman.put("22", "");
+        guZhongPingYuWoman.put("23", "");
+        guZhongPingYuWoman.put("24", "");
+        guZhongPingYuWoman.put("25", "");
+        guZhongPingYuWoman.put("26", "");
+        guZhongPingYuWoman.put("27", "");
+        guZhongPingYuWoman.put("28", "");
+        guZhongPingYuWoman.put("29", "");
+        guZhongPingYuWoman.put("30", "");
+        guZhongPingYuWoman.put("31", "");
+        guZhongPingYuWoman.put("32", "");
+        guZhongPingYuWoman.put("33", "");
+        guZhongPingYuWoman.put("34", "");
+        guZhongPingYuWoman.put("35", "");
+        guZhongPingYuWoman.put("36", "");
+        guZhongPingYuWoman.put("37", "");
+        guZhongPingYuWoman.put("38", "");
+        guZhongPingYuWoman.put("39", "");
+        guZhongPingYuWoman.put("40", "");
+        guZhongPingYuWoman.put("41", "");
+        guZhongPingYuWoman.put("42", "");
+        guZhongPingYuWoman.put("43", "");
+        guZhongPingYuWoman.put("44", "");
+        guZhongPingYuWoman.put("45", "");
+        guZhongPingYuWoman.put("46", "");
+        guZhongPingYuWoman.put("47", "");
+        guZhongPingYuWoman.put("48", "");
+        guZhongPingYuWoman.put("49", "");
+        guZhongPingYuWoman.put("50", "");
+        guZhongPingYuWoman.put("51", "");
+        guZhongPingYuWoman.put("52", "");
+        guZhongPingYuWoman.put("53", "");
+        guZhongPingYuWoman.put("54", "");
+        guZhongPingYuWoman.put("55", "");
+        guZhongPingYuWoman.put("56", "");
+        guZhongPingYuWoman.put("57", "");
+        guZhongPingYuWoman.put("58", "");
+        guZhongPingYuWoman.put("59", "");
+        guZhongPingYuWoman.put("60", "");
+        guZhongPingYuWoman.put("61", "");
+        guZhongPingYuWoman.put("62", "");
+        guZhongPingYuWoman.put("63", "");
+        guZhongPingYuWoman.put("64", "");
+        guZhongPingYuWoman.put("65", "");
+        guZhongPingYuWoman.put("66", "");
+        guZhongPingYuWoman.put("67", "");
+        guZhongPingYuWoman.put("68", "");
+        guZhongPingYuWoman.put("69", "");
+        guZhongPingYuWoman.put("70", "");
+        guZhongPingYuWoman.put("71", "");
 
 
     }
 
 
-
-
     public static int generateRelationship(String element1, String element2) {
         // 五行关系的映射关系
         String[][] relationships = {
@@ -869,9 +1139,9 @@ public class ShiShenConfig {
         for (String[] relationship : relationships) {
             if (relationship[0].equals(element1) && relationship[1].equals(element2)) {
                 int result = Integer.parseInt(relationship[2]);
-                if(result == 1 || result == 2 || result == 3) { //减分
+                if (result == 1 || result == 2 || result == 3) { //减分
                     return -1;
-                } else if(result == 4 || result == 0) {    //加减
+                } else if (result == 4 || result == 0) {    //加减
                     return 1;
                 }
             }
@@ -899,9 +1169,9 @@ public class ShiShenConfig {
             result += line; // 如果不是以上情况，原样输出
         }
 
-        if(line.contains("正东")) {
+        if (line.contains("正东")) {
             result += "正东";
-        } else if (line.contains("正西")){
+        } else if (line.contains("正西")) {
             result += "正西";
         } else if (line.contains("正南")) {
             result += "正南";
@@ -942,13 +1212,13 @@ public class ShiShenConfig {
             max = num3;
         }
 
-        if(max==num1) {
+        if (max == num1) {
             return 1;
         }
-        if(max==num2) {
+        if (max == num2) {
             return 2;
         }
-        if(max==num3) {
+        if (max == num3) {
             return 3;
         }
         return 0;

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

@@ -107,5 +107,9 @@ public interface IGanZhiService extends IService<GanZhi>{
 
     String getXiFangWei(Lunar lunar);
 
-    Map<String, String> getIndustry(Map<String, Object> riYuanQrMap);
+    String getIndustry(Map<String, Object> riYuanQrMap,String geju);
+
+    String getGuiren(List<GanZhiRowVo> ganZhiRowVoList);
+
+    Map<String, Object> getChenGu(Lunar lunar);
 }

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

@@ -957,140 +957,140 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
             String shiShen3 = list.get(i).getShiShen3();
             //正印
             if (shiShen1 != null && shiShen1.contains("正印")) {
-                Integer count = (Integer)shiShenCount.get("正印") + 1;
+                Integer count = (Integer) shiShenCount.get("正印") + 1;
                 shiShenCount.put("正印", count);
             }
             if (shiShen2 != null && shiShen2.contains("正印")) {
-                Integer count = (Integer)shiShenCount.get("正印") + 1;
+                Integer count = (Integer) shiShenCount.get("正印") + 1;
                 shiShenCount.put("正印", count);
             }
             if (shiShen3 != null && shiShen3.contains("正印")) {
-                Integer count = (Integer)shiShenCount.get("正印") + 1;
+                Integer count = (Integer) shiShenCount.get("正印") + 1;
                 shiShenCount.put("正印", count);
             }
             //食神
             if (shiShen1 != null && shiShen1.contains("食神")) {
-                Integer count = (Integer)shiShenCount.get("食神") + 1;
+                Integer count = (Integer) shiShenCount.get("食神") + 1;
                 shiShenCount.put("食神", count);
             }
             if (shiShen2 != null && shiShen2.contains("食神")) {
-                Integer count = (Integer)shiShenCount.get("食神") + 1;
+                Integer count = (Integer) shiShenCount.get("食神") + 1;
                 shiShenCount.put("食神", count);
             }
             if (shiShen3 != null && shiShen3.contains("食神")) {
-                Integer count = (Integer)shiShenCount.get("食神") + 1;
+                Integer count = (Integer) shiShenCount.get("食神") + 1;
                 shiShenCount.put("食神", count);
             }
 
             //正官
             if (shiShen1 != null && shiShen1.contains("正官")) {
-                Integer count = (Integer)shiShenCount.get("正官") + 1;
+                Integer count = (Integer) shiShenCount.get("正官") + 1;
                 shiShenCount.put("正官", count);
             }
             if (shiShen2 != null && shiShen2.contains("正官")) {
-                Integer count = (Integer)shiShenCount.get("正官") + 1;
+                Integer count = (Integer) shiShenCount.get("正官") + 1;
                 shiShenCount.put("正官", count);
             }
             if (shiShen3 != null && shiShen3.contains("正官")) {
-                Integer count = (Integer)shiShenCount.get("正官") + 1;
+                Integer count = (Integer) shiShenCount.get("正官") + 1;
                 shiShenCount.put("正官", count);
             }
 
             //正财
             if (shiShen1 != null && shiShen1.contains("正财")) {
-                Integer count = (Integer)shiShenCount.get("正财") + 1;
+                Integer count = (Integer) shiShenCount.get("正财") + 1;
                 shiShenCount.put("正财", count);
             }
             if (shiShen2 != null && shiShen2.contains("正财")) {
-                Integer count = (Integer)shiShenCount.get("正财") + 1;
+                Integer count = (Integer) shiShenCount.get("正财") + 1;
                 shiShenCount.put("正财", count);
             }
             if (shiShen3 != null && shiShen3.contains("正财")) {
-                Integer count = (Integer)shiShenCount.get("正财") + 1;
+                Integer count = (Integer) shiShenCount.get("正财") + 1;
                 shiShenCount.put("正财", count);
             }
 
             //七杀
             if (shiShen1 != null && shiShen1.contains("七杀")) {
-                Integer count = (Integer)shiShenCount.get("七杀") + 1;
+                Integer count = (Integer) shiShenCount.get("七杀") + 1;
                 shiShenCount.put("七杀", count);
             }
             if (shiShen2 != null && shiShen2.contains("七杀")) {
-                Integer count = (Integer)shiShenCount.get("七杀") + 1;
+                Integer count = (Integer) shiShenCount.get("七杀") + 1;
                 shiShenCount.put("七杀", count);
             }
             if (shiShen3 != null && shiShen3.contains("七杀")) {
-                Integer count = (Integer)shiShenCount.get("七杀") + 1;
+                Integer count = (Integer) shiShenCount.get("七杀") + 1;
                 shiShenCount.put("七杀", count);
             }
 
             //偏印
             if (shiShen1 != null && shiShen1.contains("偏印")) {
-                Integer count = (Integer)shiShenCount.get("偏印") + 1;
+                Integer count = (Integer) shiShenCount.get("偏印") + 1;
                 shiShenCount.put("偏印", count);
             }
             if (shiShen2 != null && shiShen2.contains("偏印")) {
-                Integer count = (Integer)shiShenCount.get("偏印") + 1;
+                Integer count = (Integer) shiShenCount.get("偏印") + 1;
                 shiShenCount.put("偏印", count);
             }
             if (shiShen3 != null && shiShen3.contains("偏印")) {
-                Integer count = (Integer)shiShenCount.get("偏印") + 1;
+                Integer count = (Integer) shiShenCount.get("偏印") + 1;
                 shiShenCount.put("偏印", count);
             }
 
             //偏财
             if (shiShen1 != null && shiShen1.contains("偏财")) {
-                Integer count = (Integer)shiShenCount.get("偏财") + 1;
+                Integer count = (Integer) shiShenCount.get("偏财") + 1;
                 shiShenCount.put("偏财", count);
             }
             if (shiShen2 != null && shiShen2.contains("偏财")) {
-                Integer count = (Integer)shiShenCount.get("偏财") + 1;
+                Integer count = (Integer) shiShenCount.get("偏财") + 1;
                 shiShenCount.put("偏财", count);
             }
             if (shiShen3 != null && shiShen3.contains("偏财")) {
-                Integer count = (Integer)shiShenCount.get("偏财") + 1;
+                Integer count = (Integer) shiShenCount.get("偏财") + 1;
                 shiShenCount.put("偏财", count);
             }
 
             //伤官
             if (shiShen1 != null && shiShen1.contains("伤官")) {
-                Integer count = (Integer)shiShenCount.get("伤官") + 1;
+                Integer count = (Integer) shiShenCount.get("伤官") + 1;
                 shiShenCount.put("伤官", count);
             }
             if (shiShen2 != null && shiShen2.contains("伤官")) {
-                Integer count = (Integer)shiShenCount.get("伤官") + 1;
+                Integer count = (Integer) shiShenCount.get("伤官") + 1;
                 shiShenCount.put("伤官", count);
             }
             if (shiShen3 != null && shiShen3.contains("伤官")) {
-                Integer count = (Integer)shiShenCount.get("伤官") + 1;
+                Integer count = (Integer) shiShenCount.get("伤官") + 1;
                 shiShenCount.put("伤官", count);
             }
 
             //劫财
             if (shiShen1 != null && shiShen1.contains("劫财")) {
-                Integer count = (Integer)shiShenCount.get("劫财") + 1;
+                Integer count = (Integer) shiShenCount.get("劫财") + 1;
                 shiShenCount.put("劫财", count);
             }
             if (shiShen2 != null && shiShen2.contains("劫财")) {
-                Integer count = (Integer)shiShenCount.get("劫财") + 1;
+                Integer count = (Integer) shiShenCount.get("劫财") + 1;
                 shiShenCount.put("劫财", count);
             }
             if (shiShen3 != null && shiShen3.contains("劫财")) {
-                Integer count = (Integer)shiShenCount.get("劫财") + 1;
+                Integer count = (Integer) shiShenCount.get("劫财") + 1;
                 shiShenCount.put("劫财", count);
             }
 
             //比肩
             if (shiShen1 != null && shiShen1.contains("比肩")) {
-                Integer count = (Integer)shiShenCount.get("比肩") + 1;
+                Integer count = (Integer) shiShenCount.get("比肩") + 1;
                 shiShenCount.put("比肩", count);
             }
             if (shiShen2 != null && shiShen2.contains("比肩")) {
-                Integer count = (Integer)shiShenCount.get("比肩") + 1;
+                Integer count = (Integer) shiShenCount.get("比肩") + 1;
                 shiShenCount.put("比肩", count);
             }
             if (shiShen3 != null && shiShen3.contains("比肩")) {
-                Integer count = (Integer)shiShenCount.get("比肩") + 1;
+                Integer count = (Integer) shiShenCount.get("比肩") + 1;
                 shiShenCount.put("比肩", count);
             }
 
@@ -1102,8 +1102,13 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
                 zeroCotent.append(";");
             }
         });
-        zeroCotent.deleteCharAt(zeroCotent.length() - 1);
-        shiShenCount.put("缺失十神评语",zeroCotent.toString());
+
+        if(zeroCotent.toString().length()>0) {
+            zeroCotent.deleteCharAt(zeroCotent.length() - 1);
+            shiShenCount.put("缺失十神评语", zeroCotent.toString());
+        } else {
+            shiShenCount.put("缺失十神评语", "命格中十神没有缺失，性格比较全面。");
+        }
         return shiShenCount;
     }
 
@@ -1648,15 +1653,73 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
 
 
     @Override
-    public Map<String, String> getIndustry(Map<String, Object> riYuanQrMap) {
+    public String getIndustry(Map<String, Object> riYuanQrMap, String geju) {
+
+        List<String> xiYongList = (List) riYuanQrMap.get("xiYong");
+        StringBuffer industry = new StringBuffer();
+        if (geju != null && !"".equals(geju)) {
+            industry.append("根据十神格局分析出推荐行业：");
+            industry.append(shiShenConfig.getShiShenIndustry().get(geju));
+        }
 
-        List<String> xiYongList = (List)riYuanQrMap.get("xiYong");
-        System.out.println(xiYongList);
 
+        industry.append("根据五行喜用推荐行业：");
         for (int i = 0; i < xiYongList.size(); i++) {
-            xiYongList.get(i);
+            industry.append(shiShenConfig.getFiveIndustry().get(xiYongList.get(i)));
         }
-        
+
+        return industry.toString();
+    }
+
+    @Override
+    public String getGuiren(List<GanZhiRowVo> ganZhiRowVoList) {
+
+        ganZhiRowVoList.get(0).getName();
+        ganZhiRowVoList.get(4).getName();
+
+        String guiren = shiShenConfig.getTianyiGuiren().get(ganZhiRowVoList.get(0).getName());
+        String guiren2 = shiShenConfig.getTianyiGuiren().get(ganZhiRowVoList.get(4).getName());
+
+        String guirenShengXiao = shiShenConfig.getTianyiGuirenShengXiao().get(ganZhiRowVoList.get(0).getName());
+        String guirenShengXiao2 = shiShenConfig.getTianyiGuirenShengXiao().get(ganZhiRowVoList.get(4).getName());
+
+
+        StringBuffer guiRenStr = new StringBuffer();
+        guiRenStr.append("建议多与八字中带有");
+        guiRenStr.append(guiren + "、");
+        guiRenStr.append(guiren2);
+        guiRenStr.append("的人相处。或者属相为");
+        guiRenStr.append(guirenShengXiao + "、");
+        guiRenStr.append(guirenShengXiao2);
+        guiRenStr.append("的人相处，容易得到帮助。");
+
+        return guiRenStr.toString();
+    }
+
+    @Override
+    public Map<String, Object> getChenGu(Lunar lunar) {
+
+        System.out.println(lunar.getYear());   //年
+        System.out.println(lunar.getMonth());   //月
+        System.out.println(lunar.getDay());     //日
+        // String time = lunar.getTime().toString().substring(lunar.getTime().toString().length() - 1); //时
+        // System.out.println(time);
+
+        int yearZhong = shiShenConfig.getGuZhong().get(lunar.getYearGan() + lunar.getYearZhi());
+        int monthZhong = shiShenConfig.getGuZhong().get(lunar.getMonth() + "月");
+        int dayZhong = shiShenConfig.getGuZhong().get(lunar.getDay() + "日");
+        String time = lunar.getTime().toString().substring(lunar.getTime().toString().length() - 1); //时
+        int timeZhong = shiShenConfig.getGuZhong().get(time);
+
+        System.out.println(yearZhong);
+        System.out.println(monthZhong);
+        System.out.println(dayZhong);
+        System.out.println(timeZhong);
+
+        int total = yearZhong + monthZhong + dayZhong + timeZhong;
+
+        System.out.println(total);
+
         return null;
     }
 

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

@@ -73,5 +73,9 @@ public class GanZhiVo {
     @ApiModelProperty(value = "喜用方位")
     private String xiFangWei;
 
+    @ApiModelProperty(value = "推荐行业")
+    private String industry;
 
+    @ApiModelProperty(value = "贵人")
+    private String guiren;
 }