diff --git a/src/main/java/xuan/controller/DaLiuRenController.java b/src/main/java/xuan/controller/DaLiuRenController.java new file mode 100644 index 0000000..e9b60fb --- /dev/null +++ b/src/main/java/xuan/controller/DaLiuRenController.java @@ -0,0 +1,177 @@ +package xuan.controller; + +import org.springframework.web.bind.annotation.*; +import xuan.core.daliuren.DaLiuRen; +import xuan.core.daliuren.settings.DaLiuRenJiChuSetting; +import xuan.core.daliuren.settings.DaLiuRenShenShaSetting; + +import java.util.*; + +@RestController +@RequestMapping("/api/daliuren") +public class DaLiuRenController { + + @PostMapping("/paipan") + public Map paiPan(@RequestBody DaLiuRenRequest request) { + Map result = new HashMap<>(); + try { + DaLiuRenJiChuSetting setting = new DaLiuRenJiChuSetting(); + setting.setName(request.getName() != null ? request.getName() : "某人"); + setting.setOccupy(request.getOccupy() != null ? request.getOccupy() : "某事"); + setting.setSex(request.getSex() != null ? request.getSex() : 1); + setting.setDate(request.getDate() != null ? request.getDate() : "2024-01-01 00:00:00"); + setting.setDateType(request.getDateType() != null ? request.getDateType() : 0); + setting.setLeapMonthType(request.getLeapMonthType() != null ? request.getLeapMonthType() : 0); + setting.setXuShiSuiType(request.getXuShiSuiType() != null ? request.getXuShiSuiType() : 0); + setting.setJieQiType(request.getJieQiType() != null ? request.getJieQiType() : 1); + setting.setGuiRenType(request.getGuiRenType() != null ? request.getGuiRenType() : 0); + setting.setYearGanZhiType(request.getYearGanZhiType() != null ? request.getYearGanZhiType() : 2); + setting.setMonthGanZhiType(request.getMonthGanZhiType() != null ? request.getMonthGanZhiType() : 1); + setting.setDayGanZhiType(request.getDayGanZhiType() != null ? request.getDayGanZhiType() : 0); + + DaLiuRen daLiuRen = new DaLiuRen(setting); + daLiuRen.daLiuRenShenShaSetting(new DaLiuRenShenShaSetting()); + + result.put("success", true); + result.put("data", buildDaLiuRenData(daLiuRen)); + } catch (Exception e) { + result.put("success", false); + result.put("error", e.getMessage()); + e.printStackTrace(); + } + return result; + } + + private Map buildDaLiuRenData(DaLiuRen daLiuRen) { + Map data = new HashMap<>(); + + data.put("name", daLiuRen.getName()); + data.put("sex", daLiuRen.getSex()); + data.put("age", daLiuRen.getAge()); + data.put("occupy", daLiuRen.getOccupy()); + + data.put("solar", daLiuRen.getSolarStr2()); + data.put("lunar", daLiuRen.getLunarStr2()); + data.put("xingQi", daLiuRen.getXingQi()); + data.put("jiJie", daLiuRen.getJiJie()); + data.put("shengXiao", daLiuRen.getShengXiao()); + data.put("xingZuo", daLiuRen.getXingZuo()); + + data.put("yearGanZhi", daLiuRen.getYearGanZhi()); + data.put("monthGanZhi", daLiuRen.getMonthGanZhi()); + data.put("dayGanZhi", daLiuRen.getDayGanZhi()); + data.put("hourGanZhi", daLiuRen.getHourGanZhi()); + + data.put("yearGan", daLiuRen.getYearGan()); + data.put("monthGan", daLiuRen.getMonthGan()); + data.put("dayGan", daLiuRen.getDayGan()); + data.put("hourGan", daLiuRen.getHourGan()); + + data.put("yearZhi", daLiuRen.getYearZhi()); + data.put("monthZhi", daLiuRen.getMonthZhi()); + data.put("dayZhi", daLiuRen.getDayZhi()); + data.put("hourZhi", daLiuRen.getHourZhi()); + + data.put("yearGanWuXing", daLiuRen.getYearGanWuXing()); + data.put("monthGanWuXing", daLiuRen.getMonthGanWuXing()); + data.put("dayGanWuXing", daLiuRen.getDayGanWuXing()); + data.put("hourGanWuXing", daLiuRen.getHourGanWuXing()); + + data.put("yearZhiWuXing", daLiuRen.getYearZhiWuXing()); + data.put("monthZhiWuXing", daLiuRen.getMonthZhiWuXing()); + data.put("dayZhiWuXing", daLiuRen.getDayZhiWuXing()); + data.put("hourZhiWuXing", daLiuRen.getHourZhiWuXing()); + + data.put("yearGanZhiNaYin", daLiuRen.getYearGanZhiNaYin()); + data.put("monthGanZhiNaYin", daLiuRen.getMonthGanZhiNaYin()); + data.put("dayGanZhiNaYin", daLiuRen.getDayGanZhiNaYin()); + data.put("hourGanZhiNaYin", daLiuRen.getHourGanZhiNaYin()); + + data.put("yearGanZhiKongWang", daLiuRen.getYearGanZhiKongWang()); + data.put("monthGanZhiKongWang", daLiuRen.getMonthGanZhiKongWang()); + data.put("dayGanZhiKongWang", daLiuRen.getDayGanZhiKongWang()); + data.put("hourGanZhiKongWang", daLiuRen.getHourGanZhiKongWang()); + + data.put("wuXingWangShuai", daLiuRen.getWuXingWangShuai()); + + data.put("prevJie", daLiuRen.getPrevJie()); + data.put("nextJie", daLiuRen.getNextJie()); + data.put("prevJieDateStr", daLiuRen.getPrevJieDateStr()); + data.put("nextJieDateStr", daLiuRen.getNextJieDateStr()); + data.put("prevJieDay", daLiuRen.getPrevJieDay()); + data.put("nextJieDay", daLiuRen.getNextJieDay()); + data.put("chuShengJie", daLiuRen.getChuShengJie()); + + data.put("prevQi", daLiuRen.getPrevQi()); + data.put("nextQi", daLiuRen.getNextQi()); + data.put("prevQiDateStr", daLiuRen.getPrevQiDateStr()); + data.put("nextQiDateStr", daLiuRen.getNextQiDateStr()); + data.put("prevQiDay", daLiuRen.getPrevQiDay()); + data.put("nextQiDay", daLiuRen.getNextQiDay()); + data.put("chuShengQi", daLiuRen.getChuShengQi()); + + data.put("yueXiang", daLiuRen.getYueXiang()); + data.put("yueJiang", daLiuRen.getYueJiang()); + data.put("yueJiangShen", daLiuRen.getYueJiangShen()); + + data.put("wuBuYuShi", daLiuRen.getWuBuYuShi()); + data.put("tianDiPanType", daLiuRen.getTianDiPanType()); + + data.put("tianGan", daLiuRen.getTianGan()); + data.put("diPan", daLiuRen.getDiPan()); + data.put("tianPan", daLiuRen.getTianPan()); + data.put("shenPan", daLiuRen.getShenPan()); + + data.put("siKe", daLiuRen.getSiKe()); + data.put("siKeDunGan", daLiuRen.getSiKeDunGan()); + data.put("siKeShenJiang", daLiuRen.getSiKeShenJiang()); + + data.put("sanChuan", daLiuRen.getSanChuan()); + data.put("sanChuanDunGan", daLiuRen.getSanChuanDunGan()); + data.put("sanChuanShenJiang", daLiuRen.getSanChuanShenJiang()); + data.put("sanChuanLiuQin", daLiuRen.getSanChuanLiuQin()); + data.put("sanChuanQuFa", daLiuRen.getSanChuanQuFa()); + + return data; + } + + public static class DaLiuRenRequest { + private String name; + private String occupy; + private Integer sex; + private String date; + private Integer dateType; + private Integer leapMonthType; + private Integer xuShiSuiType; + private Integer jieQiType; + private Integer guiRenType; + private Integer yearGanZhiType; + private Integer monthGanZhiType; + private Integer dayGanZhiType; + + public String getName() { return name; } + public void setName(String name) { this.name = name; } + public String getOccupy() { return occupy; } + public void setOccupy(String occupy) { this.occupy = occupy; } + public Integer getSex() { return sex; } + public void setSex(Integer sex) { this.sex = sex; } + public String getDate() { return date; } + public void setDate(String date) { this.date = date; } + public Integer getDateType() { return dateType; } + public void setDateType(Integer dateType) { this.dateType = dateType; } + public Integer getLeapMonthType() { return leapMonthType; } + public void setLeapMonthType(Integer leapMonthType) { this.leapMonthType = leapMonthType; } + public Integer getXuShiSuiType() { return xuShiSuiType; } + public void setXuShiSuiType(Integer xuShiSuiType) { this.xuShiSuiType = xuShiSuiType; } + public Integer getJieQiType() { return jieQiType; } + public void setJieQiType(Integer jieQiType) { this.jieQiType = jieQiType; } + public Integer getGuiRenType() { return guiRenType; } + public void setGuiRenType(Integer guiRenType) { this.guiRenType = guiRenType; } + public Integer getYearGanZhiType() { return yearGanZhiType; } + public void setYearGanZhiType(Integer yearGanZhiType) { this.yearGanZhiType = yearGanZhiType; } + public Integer getMonthGanZhiType() { return monthGanZhiType; } + public void setMonthGanZhiType(Integer monthGanZhiType) { this.monthGanZhiType = monthGanZhiType; } + public Integer getDayGanZhiType() { return dayGanZhiType; } + public void setDayGanZhiType(Integer dayGanZhiType) { this.dayGanZhiType = dayGanZhiType; } + } +} diff --git a/xuan-deduct-uniapp/src/pages.json b/xuan-deduct-uniapp/src/pages.json index 03e03cd..0527863 100644 --- a/xuan-deduct-uniapp/src/pages.json +++ b/xuan-deduct-uniapp/src/pages.json @@ -33,11 +33,27 @@ "navigationBarTextStyle": "white" } }, + { + "path": "pages/liuyao/result", + "style": { + "navigationBarTitleText": "六爻卦象", + "navigationBarBackgroundColor": "#2563EB", + "navigationBarTextStyle": "white" + } + }, { "path": "pages/daliuren/daliuren", "style": { "navigationBarTitleText": "大六壬排盘", - "navigationBarBackgroundColor": "#7C3AED", + "navigationBarBackgroundColor": "#059669", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/daliuren/result", + "style": { + "navigationBarTitleText": "大六壬命盘", + "navigationBarBackgroundColor": "#059669", "navigationBarTextStyle": "white" } }, @@ -53,7 +69,15 @@ "path": "pages/meihua/meihua", "style": { "navigationBarTitleText": "梅花易数排盘", - "navigationBarBackgroundColor": "#059669", + "navigationBarBackgroundColor": "#DB2777", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/meihua/result", + "style": { + "navigationBarTitleText": "梅花易数卦象", + "navigationBarBackgroundColor": "#DB2777", "navigationBarTextStyle": "white" } }, diff --git a/xuan-deduct-uniapp/src/pages/daliuren/daliuren.vue b/xuan-deduct-uniapp/src/pages/daliuren/daliuren.vue index abd298d..18d98c9 100644 --- a/xuan-deduct-uniapp/src/pages/daliuren/daliuren.vue +++ b/xuan-deduct-uniapp/src/pages/daliuren/daliuren.vue @@ -1,52 +1,397 @@ - diff --git a/xuan-deduct-uniapp/src/pages/daliuren/result.vue b/xuan-deduct-uniapp/src/pages/daliuren/result.vue new file mode 100644 index 0000000..dda5a6c --- /dev/null +++ b/xuan-deduct-uniapp/src/pages/daliuren/result.vue @@ -0,0 +1,576 @@ + + + + + diff --git a/xuan-deduct-uniapp/src/utils/api.js b/xuan-deduct-uniapp/src/utils/api.js index bf9e1b1..7e353ef 100644 --- a/xuan-deduct-uniapp/src/utils/api.js +++ b/xuan-deduct-uniapp/src/utils/api.js @@ -77,8 +77,58 @@ const liuyaoApi = { } } +const daliurenApi = { + paiPan: (data) => { + return request({ + url: '/daliuren/paipan', + method: 'POST', + data: { + name: data.name || '某人', + occupy: data.occupy || '某事', + sex: data.sex || 1, + date: data.date, + dateType: data.dateType || 0, + leapMonthType: data.leapMonthType || 0, + xuShiSuiType: data.xuShiSuiType || 0, + jieQiType: data.jieQiType || 1, + guiRenType: data.guiRenType || 0, + yearGanZhiType: data.yearGanZhiType || 2, + monthGanZhiType: data.monthGanZhiType || 1, + dayGanZhiType: data.dayGanZhiType || 0 + } + }) + } +} + +const qimenApi = { + paiPan: (data) => { + return request({ + url: '/qimen/paipan', + method: 'POST', + data: { + name: data.name || '某人', + occupy: data.occupy || '某事', + sex: data.sex || 1, + date: data.date, + dateType: data.dateType || 0, + leapMonthType: data.leapMonthType || 0, + xuShiSuiType: data.xuShiSuiType || 0, + jieQiType: data.jieQiType || 1, + paiPanType: data.paiPanType || 3, + zhiShiType: data.zhiShiType || 0, + yueJiaQiJuType: data.yueJiaQiJuType || 1, + yearGanZhiType: data.yearGanZhiType || 2, + monthGanZhiType: data.monthGanZhiType || 1, + dayGanZhiType: data.dayGanZhiType || 0 + } + }) + } +} + export default { baziApi, liuyaoApi, + daliurenApi, + qimenApi, request }