格局

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

@@ -85,8 +85,7 @@ public class GanZhiController extends BaseController {
 
 
         int maxTianGan = ganZhiService.getMaxTianGan(ganZhiDto);  //最出能量最强的天干
-        ganZhiService.getGeJu(ganZhiRowVoList,maxTianGan,riYuanQrMap.get("qr").toString()); //查出八字常见格局
-
+        Map<String,String> geJuMap = ganZhiService.getGeJu(ganZhiRowVoList,maxTianGan,riYuanQrMap.get("qr").toString()); //查出八字常见格局
 
 
         Map<String, Integer> fiveCountMap = ganZhiService.getGanZhiRowVoCount(ganZhiDto);
@@ -111,6 +110,7 @@ public class GanZhiController extends BaseController {
         ganZhiVo.setZaoShiMap(zaoShiCount);
         ganZhiVo.setDiseasePartList(diseasePartList);
         ganZhiVo.setDaYunList(ganZhiDto.getDaYunList());
+        ganZhiVo.setGeJuMap(geJuMap);
 
         // 输出结果
         return Response.success(ganZhiVo);

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

@@ -1149,9 +1149,20 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
         }
 
         List<GeJu> list2 = geJuMapper.selectGeJuList2(geJu);
-        System.out.println(list2);
-        return null;
+
+        StringBuffer content = new StringBuffer();
+        for (int i = 0; i < list2.size(); i++) {
+            content.append(list2.get(i).getContent());
+        }
+
+        Map<String,String> geJuMap = new TreeMap<String,String>();
+        geJuMap.put("geju",geju);
+        geJuMap.put("content",content.toString());
+        return geJuMap;
     }
 
 
+
+
+
 }

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

@@ -43,6 +43,9 @@ public class GanZhiVo {
     @ApiModelProperty(value = "喜用数字")
     private Map<String,Object> numberYunMap;
 
+    @ApiModelProperty(value = "八字格局")
+    private Map<String,String> geJuMap;
+
     @ApiModelProperty(value = "八字五行集合")
     private List<GanZhiRowVo> ganZhiRowVoList;
 
@@ -61,4 +64,6 @@ public class GanZhiVo {
     @ApiModelProperty(value = "疾病集合")
     private List<DiseasePart> diseasePartList;
 
+
+
 }