|
@@ -1,15 +1,16 @@
|
|
|
package com.miaxis.gan.service.impl;
|
|
|
|
|
|
-import java.util.*;
|
|
|
-
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.miaxis.common.config.ShiShenConfig;
|
|
|
import com.miaxis.common.utils.DateUtils;
|
|
|
import com.miaxis.disease.domain.DiseasePart;
|
|
|
import com.miaxis.disease.dto.DiseasePartDto;
|
|
|
import com.miaxis.disease.mapper.DiseasePartMapper;
|
|
|
+import com.miaxis.gan.domain.GanZhi;
|
|
|
import com.miaxis.gan.dto.GanZhiDto;
|
|
|
import com.miaxis.gan.dto.LiuNianDto;
|
|
|
+import com.miaxis.gan.mapper.GanZhiMapper;
|
|
|
+import com.miaxis.gan.service.IGanZhiService;
|
|
|
import com.miaxis.gan.vo.GanZhiDaYunVo;
|
|
|
import com.miaxis.gan.vo.GanZhiKongWangVo;
|
|
|
import com.miaxis.gan.vo.GanZhiNaYinVo;
|
|
@@ -21,13 +22,11 @@ import com.miaxis.jie.vo.JieQiVo;
|
|
|
import com.miaxis.number.domain.NumberYun;
|
|
|
import com.miaxis.number.mapper.NumberYunMapper;
|
|
|
import com.nlf.calendar.Lunar;
|
|
|
-import org.apache.poi.xssf.usermodel.XSSFPivotTable;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
-import com.miaxis.gan.mapper.GanZhiMapper;
|
|
|
-import com.miaxis.gan.domain.GanZhi;
|
|
|
-import com.miaxis.gan.service.IGanZhiService;
|
|
|
+
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
|
* 天干地支Service业务层处理
|
|
@@ -2536,4 +2535,42 @@ public class GanZhiServiceImpl extends ServiceImpl<GanZhiMapper, GanZhi> impleme
|
|
|
}
|
|
|
|
|
|
|
|
|
+ @Override
|
|
|
+ public Map<Integer, String> getZiNvYun(List<GanZhiRowVo> ganZhiRowVoList, Map<String, Object> riYuanQrMap, Map<String, Integer> shiShenCountMap, Map<String, Integer> fiveCountMap, String geju, List<GanZhiKongWangVo> kongwangList) {
|
|
|
+ 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");
|
|
|
+
|
|
|
+
|
|
|
+ String sex = ganZhiRowVoList.get(4).getShiShen1();
|
|
|
+ String five = ganZhiRowVoList.get(4).getName();
|
|
|
+ if ("元男".equals(sex)) { //正官=女儿 七杀=儿子
|
|
|
+
|
|
|
+
|
|
|
+ } else if ("元女".equals(sex)) { //食神
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ int x = 1; //序号
|
|
|
+ //以下带了三条以上,都不好要孩子。
|
|
|
+ Map<Integer, String> ziNvMap = new TreeMap<Integer, String>();
|
|
|
+ //1.子女星空亡 与子女缘薄
|
|
|
+ String dayGan = ganZhiRowVoList.get(5).getName();
|
|
|
+
|
|
|
+
|
|
|
+ //2.时柱两个字空亡 与子女缘薄
|
|
|
+
|
|
|
+
|
|
|
+ //3.本命局没有子女星 与子女缘薄
|
|
|
+
|
|
|
+
|
|
|
+ //4 男命食神格,伤官格,与子女缘薄,; 女命正印格,偏印格,与子女缘薄
|
|
|
+
|
|
|
+
|
|
|
+ return ziNvMap;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
}
|