From c5322ec177535837ef608f020712c876544e44eb Mon Sep 17 00:00:00 2001 From: haotianmingyue <2421912570@qq.com> Date: Sun, 13 Oct 2024 15:34:59 +0800 Subject: [PATCH] =?UTF-8?q?ShuliJixiong=20=E4=B8=AD=E6=B7=BB=E5=8A=A0=20wu?= =?UTF-8?q?xing=EF=BC=8Cjixiong=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E3=80=82=20ShuliJixiongServiceImpl=E4=B8=AD=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=20selectLiugeContent=20=E6=96=B9=E6=B3=95=20=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=20fiveElementsVo=E5=8F=82=E6=95=B0=EF=BC=8C=E7=BB=99shulijixio?= =?UTF-8?q?ng=20wuxing=EF=BC=8Cjixiong=E8=B5=8B=E5=80=BC=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 15 ++- ruoyi-admin/pom.xml | 2 +- .../xmComtroller/ApiController.java | 20 +++- .../xmComtroller/BackController.java | 102 +++++++++++------ .../xmComtroller/CalculateController.java | 108 ++++++++++++++++-- .../xmComtroller/PayController.java | 19 ++- .../main/java/com/ruoyi/web/utils/XMUtil.java | 80 ++++++++++++- .../src/main/resources/application-druid.yml | 8 +- .../src/main/resources/application.yml | 4 +- .../com/ruoyi/system/domain/ShuliJixiong.java | 24 ++++ .../com/ruoyi/system/domain/dto/XmDto.java | 8 ++ .../com/ruoyi/system/domain/vo/LiuGeVo.java | 17 ++- .../system/service/IShuliJixiongService.java | 3 +- .../service/impl/ShuliJixiongServiceImpl.java | 33 +++++- 14 files changed, 370 insertions(+), 73 deletions(-) diff --git a/pom.xml b/pom.xml index 49fcae09..e900b717 100644 --- a/pom.xml +++ b/pom.xml @@ -202,7 +202,7 @@ - + public @@ -214,6 +214,19 @@ + + + + + + + + + + + + + public diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 47cc8fff..bab1cfe5 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -55,7 +55,7 @@ mysql mysql-connector-java - 5.1.38 + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/ApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/ApiController.java index f12890df..c873448f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/ApiController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/ApiController.java @@ -34,6 +34,9 @@ import java.util.List; import java.util.Random; import java.util.concurrent.TimeUnit; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; import static com.ruoyi.common.utils.PageUtils.startPage; @RestController @@ -128,11 +131,15 @@ public class ApiController extends BaseController { @PostMapping("/login") public AjaxResult login(@RequestBody XmLoginDto xmLoginDto) throws Exception { // 生成令牌 + System.out.println("登录者手机"+xmLoginDto.getPhone()); String sms = redisCache.getCacheObject("SMSCODE:" + xmLoginDto.getPhone()); + System.out.println("SMSCODE:" + xmLoginDto.getPhone()); + System.out.println("验证码"+sms); if (!sms.equals(xmLoginDto.getSmsCode())) { return AjaxResult.error("短信验证码错误"); } SysUser sysUser = sysUserService.selectUserByUserName(xmLoginDto.getPhone()); + System.out.println(sysUser); if (sysUser == null) { SysUser newSysUser = new SysUser(); newSysUser.setUserName(xmLoginDto.getPhone()); @@ -148,6 +155,10 @@ public class ApiController extends BaseController { //初始默认6次 sysSignIn.setStatus(1L); sysSignIn.setCalculateNumber(10L); + + DateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd"); + Date myDate1 = dateFormat1.parse("2009-06-01"); + sysSignIn.setSignUpdateTime(myDate1); //TODO 设置为普通香民 增加返回连续上香天数 测算时间 sysSignInService.insertSysSignIn(sysSignIn); String token = loginService.login(xmLoginDto.getPhone(), xmLoginDto.getPhone(), xmLoginDto.getImgCode(), xmLoginDto.getUuid()); @@ -162,13 +173,14 @@ public class ApiController extends BaseController { // TODO 增加返回连续上香天数 测算时间 ajax.put(Constants.TOKEN, token); + System.out.println(sysUser.getUserId()); SysSignIn sysSignIn = sysSignInService.selectSysSignInByUId(sysUser.getUserId()); + System.out.println(sysSignIn); + + sysSignInService.loginVerificationInformation(sysSignIn); -// if (sysSignIn.) -// ajax.put("status", sysSignIn.getStatus()); -// ajax.put("vipStopTime", sysSignIn.getVipStopTime()); ajax.put("calculateNumber", sysSignIn.getCalculateNumber()); ajax.put("phone", xmLoginDto.getPhone()); return ajax; @@ -190,6 +202,8 @@ public class ApiController extends BaseController { Random random = new Random(); String smsCode = String.valueOf(100000 + random.nextInt(900000)); SendSms.sendSmsCode(xmLoginDto.getPhone(), smsCode); + System.out.println("验证码是"+smsCode); + // 将短信验证码存入redis redisCache.setCacheObject("SMSCODE:" + xmLoginDto.getPhone(), smsCode, 1, TimeUnit.HOURS); return ajax; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/BackController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/BackController.java index fb36f63a..78b5b708 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/BackController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/BackController.java @@ -58,7 +58,7 @@ public class BackController { SysSignIn sysSignIn = sysSignInService.selectSysSignInByUId(uid); if (type.equals("4")) { - System.out.println("微信支付回调函数执行中=====第四档充值 用户id:" + uid + "=====高级充值，次数无限，时间为两年 status修改为2====="); + System.out.println("微信支付回调函数执行中=====第四档充值 用户id:" + uid + "=====高级充值，次数无限，时间为1年 status修改为2====="); sysSignIn.setCalculateNumber(sysSignIn.getCalculateNumber() + addNumber); sysSignIn.setStatus(2L); // 设置时间 @@ -68,7 +68,7 @@ public class BackController { // 将时间设置为当前时间 calendar.setTime(new Date()); // 将时间增加两年 - calendar.add(Calendar.YEAR, 2); + calendar.add(Calendar.YEAR, 1); // 获取增加两年后的时间 Date vipStopTime = calendar.getTime(); // 设置sysSignIn对象的vipStopTime为增加两年后的时间 @@ -76,61 +76,99 @@ public class BackController { } else { Calendar calendar = Calendar.getInstance(); calendar.setTime(sysSignIn.getVipStopTime()); - calendar.add(Calendar.YEAR, 2); + calendar.add(Calendar.YEAR, 1); // 获取增加两年后的时间 Date vipStopTime = calendar.getTime(); // 设置sysSignIn对象的vipStopTime为增加两年后的时间 sysSignIn.setVipStopTime(vipStopTime); } PayRecord payRecord = new PayRecord(); - payRecord.setPayAmount(298000L); + payRecord.setPayAmount(49900L); payRecord.setPayTime(DateUtils.getNowDate()); payRecord.setPayType(4L); payRecord.setPayDelete(0); - payRecord.setPayMsg("一年不限次测算，额外赠送一年使用权"); + payRecord.setPayMsg("充值一年499元"); payRecord.setUid(uid); payRecord.setVipStopTime(sysSignIn.getVipStopTime()); // TODO 插入历史记录 payRecordService.insertPayRecord(payRecord); sysSignInService.updateSysSignIn(sysSignIn); result = "success"; - } else if (type.equals("5")) { - System.out.println("微信支付回调函数执行中=====第五档充值 用户id:" + uid + "=====高级充值，次数无限，时间为5年 status修改为2====="); + } else if(type.equals("3")){ + System.out.println("微信支付回调函数执行中=====第三档充值 用户id:" + uid + "=======高级充值，次数无限，时间为六个月 status修改为2====="); sysSignIn.setCalculateNumber(sysSignIn.getCalculateNumber() + addNumber); sysSignIn.setStatus(2L); +// 设置时间 if (sysSignIn.getVipStopTime() == null) { sysSignIn.setVipStartTime(new Date()); Calendar calendar = Calendar.getInstance(); // 将时间设置为当前时间 calendar.setTime(new Date()); // 将时间增加两年 - calendar.add(Calendar.YEAR, 5); + calendar.add(Calendar.MONTH, 6); // 获取增加两年后的时间 Date vipStopTime = calendar.getTime(); // 设置sysSignIn对象的vipStopTime为增加两年后的时间 sysSignIn.setVipStopTime(vipStopTime); } else { Calendar calendar = Calendar.getInstance(); - Date vipStopTime1 = sysSignIn.getVipStopTime(); - calendar.setTime(vipStopTime1); - calendar.add(Calendar.YEAR, 5); + calendar.setTime(sysSignIn.getVipStopTime()); + calendar.add(Calendar.YEAR, 1); // 获取增加两年后的时间 Date vipStopTime = calendar.getTime(); // 设置sysSignIn对象的vipStopTime为增加两年后的时间 sysSignIn.setVipStopTime(vipStopTime); } PayRecord payRecord = new PayRecord(); - payRecord.setPayAmount(498000L); + payRecord.setPayAmount(29900L); payRecord.setPayTime(DateUtils.getNowDate()); - payRecord.setPayType(5L); + payRecord.setPayType(3L); payRecord.setPayDelete(0); - payRecord.setPayMsg("三年不限次测算，额外赠送二年使用权"); + payRecord.setPayMsg("充值六个月299元"); payRecord.setUid(uid); payRecord.setVipStopTime(sysSignIn.getVipStopTime()); +// TODO 插入历史记录 payRecordService.insertPayRecord(payRecord); sysSignInService.updateSysSignIn(sysSignIn); result = "success"; - } else { + } else if(type.equals("2")){ + System.out.println("微信支付回调函数执行中=====第三档充值 用户id:" + uid + "=======高级充值，次数无限，时间为1个月 status修改为2====="); + sysSignIn.setCalculateNumber(sysSignIn.getCalculateNumber() + addNumber); + sysSignIn.setStatus(2L); +// 设置时间 + if (sysSignIn.getVipStopTime() == null) { + sysSignIn.setVipStartTime(new Date()); + Calendar calendar = Calendar.getInstance(); + // 将时间设置为当前时间 + calendar.setTime(new Date()); + // 将时间增加两年 + calendar.add(Calendar.MONTH, 6); + // 获取增加两年后的时间 + Date vipStopTime = calendar.getTime(); + // 设置sysSignIn对象的vipStopTime为增加两年后的时间 + sysSignIn.setVipStopTime(vipStopTime); + } else { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(sysSignIn.getVipStopTime()); + calendar.add(Calendar.YEAR, 1); + // 获取增加两年后的时间 + Date vipStopTime = calendar.getTime(); + // 设置sysSignIn对象的vipStopTime为增加两年后的时间 + sysSignIn.setVipStopTime(vipStopTime); + } + PayRecord payRecord = new PayRecord(); + payRecord.setPayAmount(9900L); + payRecord.setPayTime(DateUtils.getNowDate()); + payRecord.setPayType(3L); + payRecord.setPayDelete(0); + payRecord.setPayMsg("充值1个月99元"); + payRecord.setUid(uid); + payRecord.setVipStopTime(sysSignIn.getVipStopTime()); +// TODO 插入历史记录 + payRecordService.insertPayRecord(payRecord); + sysSignInService.updateSysSignIn(sysSignIn); + result = "success"; + }else if (type.equals("1")) { System.out.println("微信支付回调函数执行中 第一第二第三档位充值===== 用户id:" + uid + "充值有限次数==========增加次数是：" + addNumber); sysSignIn.setCalculateNumber(sysSignIn.getCalculateNumber() + addNumber); // 判断当前用户状态是否为2L，如果为2L则不更改 @@ -139,29 +177,29 @@ public class BackController { } PayRecord payRecord = new PayRecord(); if (addNumber == 50) { - payRecord.setPayAmount(10000L); + payRecord.setPayAmount(5000L); payRecord.setPayTime(DateUtils.getNowDate()); payRecord.setPayType(1L); payRecord.setPayDelete(0); payRecord.setPayMsg("50次测算次数"); payRecord.setUid(uid); } - if (addNumber == 180) { - payRecord.setPayAmount(30000L); - payRecord.setPayTime(DateUtils.getNowDate()); - payRecord.setPayType(2L); - payRecord.setPayDelete(0); - payRecord.setPayMsg("180次测算次数"); - payRecord.setUid(uid); - } - if (addNumber == 300) { - payRecord.setPayAmount(50000L); - payRecord.setPayTime(DateUtils.getNowDate()); - payRecord.setPayType(3L); - payRecord.setPayDelete(0); - payRecord.setPayMsg("300次测算次数"); - payRecord.setUid(uid); - } +// if (addNumber == 180) { +// payRecord.setPayAmount(30000L); +// payRecord.setPayTime(DateUtils.getNowDate()); +// payRecord.setPayType(2L); +// payRecord.setPayDelete(0); +// payRecord.setPayMsg("180次测算次数"); +// payRecord.setUid(uid); +// } +// if (addNumber == 300) { +// payRecord.setPayAmount(50000L); +// payRecord.setPayTime(DateUtils.getNowDate()); +// payRecord.setPayType(3L); +// payRecord.setPayDelete(0); +// payRecord.setPayMsg("300次测算次数"); +// payRecord.setUid(uid); +// } payRecordService.insertPayRecord(payRecord); sysSignInService.updateSysSignIn(sysSignIn); result = "success"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/CalculateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/CalculateController.java index 3518e3c9..e199d15f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/CalculateController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/CalculateController.java @@ -2,6 +2,7 @@ package com.ruoyi.web.controller.xmComtroller; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.framework.web.domain.server.Sys; import com.ruoyi.system.domain.ShuliJixiong; import com.ruoyi.system.domain.SysSignIn; import com.ruoyi.system.domain.dto.XmDto; @@ -95,8 +96,10 @@ public class CalculateController extends BaseController { if (xmDto.getType() == 0) { - //男士或未婚女士 - nameMap = XMUtil.getSurName(xmDto); + //男士或未婚女士, 这里通过 姓和名来判断是否是复姓，复名，在只用姓名的情况下，不能用了 +// nameMap = XMUtil.getSurName(xmDto); + // 根据名字拆分姓和名 + nameMap = XMUtil.getSurNameAndName(xmDto); if (nameMap.get("TYPE")==null){ return AjaxResult.error(500,"请输入正确姓氏"); } @@ -106,12 +109,12 @@ public class CalculateController extends BaseController { // 获取六格 liugeVo = XMUtil.getliuge(newbiHuaList, nameMap); - List fiveElementsVO = XMUtil.getFiveElements(liugeVo); + List fiveElementsVO = XMUtil.getFiveElements(liugeVo, 0); liugeVo.setStatus(status); liugeVo.setFiveElementsVOList(fiveElementsVO); // shuliJixiongService.selectLiugeContent(liugeVo); - shuliJixiongService.selectLiugeContent(liugeVo); + shuliJixiongService.selectLiugeContent(liugeVo, fiveElementsVO); //计算先天,后天 ShuliJixiong xiantian = shuliJixiongService.selectShuliJixiongById((long) liugeVo.getRenge().getNumber()); @@ -135,29 +138,103 @@ public class CalculateController extends BaseController { liugeVo); } else { + + Integer number = 0; + Integer tiange = 0; + Integer renge = 0; + Integer dige = 0; + + List nameList = XMUtil.splitChineseCharacters(xmDto.getName()); + + List newbiHuaList = hanziService.selectKxHanziByhanzi(oldBihuaList, nameList); + int size = oldBihuaList.size(); if (size == 3) { nameMap.put("X",xmDto.getName().substring(0,2)); - nameMap.put("M",xmDto.getName().substring(3)); + nameMap.put("M",xmDto.getName().substring(2)); nameMap.put("TYPE", "FXDM"); + + number = newbiHuaList.stream().reduce(0, Integer::sum); +// number = number + 1; + tiange = newbiHuaList.get(0) + newbiHuaList.get(1); + renge = newbiHuaList.get(1) + newbiHuaList.get(2); + dige = newbiHuaList.get(2) + 1; } - if (size==4){ + else if (size == 4){ nameMap.put("X",xmDto.getName().substring(0,2)); nameMap.put("M",xmDto.getName().substring(2,4)); nameMap.put("TYPE", "FXFM"); + + number = newbiHuaList.stream().reduce(0, Integer::sum); + tiange = newbiHuaList.get(0) + newbiHuaList.get(1); + renge = newbiHuaList.get(1) + newbiHuaList.get(2); + dige = newbiHuaList.get(2) + newbiHuaList.get(3); } - List nameList = XMUtil.splitChineseCharacters(xmDto.getName()); - //查找康熙字典的笔画 - List newbiHuaList = hanziService.selectKxHanziByhanzi(oldBihuaList, nameList); + +// List nameList = XMUtil.splitChineseCharacters(xmDto.getName()); +// //查找康熙字典的笔画 +// List newbiHuaList = hanziService.selectKxHanziByhanzi(oldBihuaList, nameList); + +//----------------------------------------------旧版获取六格---------------------------------------------------------------------------- + + //------------------------------------ 添加家庭格---------------------------------------------- + ShuliJixiong shuliJixiong = shuliJixiongService.selectShuliJixiongById(Long.valueOf(number)); + + + + String fiveElementByNum = XMUtil.getFiveElementByNum(number); + // 修改查询家庭运 + String jiating = luckLjService.selectLuckJiaTing( + XMUtil.getElementByNum(tiange) , + XMUtil.getElementByNum(renge), + XMUtil.getElementByNum(dige)); + //--------20241013修改--将家庭格中数理吉凶中的含义最后添加家庭运--------------------------- + // +// String hanyi = shuliJixiong.getHanyi(); +// shuliJixiong.setHanyi(hanyi+'\n'+jiating); +// System.out.println(hanyi); +// System.out.println(jiating); + //----------end--20241013----------------- + + MarriedVo marriedVo = new MarriedVo(); + marriedVo.setJiating(jiating); + //-------------------------梳理吉凶中添加 wuxing，吉凶。---------------------- + shuliJixiong.setJixiong(XMUtil.getJiXiong(number)); + shuliJixiong.setWuxing(fiveElementByNum); + //------------------------- + marriedVo.setShuliJixiong(shuliJixiong); + marriedVo.setWuxing(fiveElementByNum); + marriedVo.setNumber(number); + marriedVo.setJixiong(XMUtil.getJiXiong(number)); +// sysSignIn.setCalculateNumber(sysSignIn.getCalculateNumber()-1); +// sysSignInService.updateSysSignIn(sysSignIn); + marriedVo.setCalculateNumber(sysSignIn.getCalculateNumber()); + //-------------------------------------end家庭格------------------------------------------------------- + // 获取六格 liugeVo = XMUtil.getliuge(newbiHuaList, nameMap); - List fiveElementsVO = XMUtil.getFiveElements(liugeVo); + List fiveElementsVO = XMUtil.getFiveElements(liugeVo, 1); + FiveElementsVo b_marriedVo = fiveElementsVO.get(5); + + // ------------------------------------设置家庭格---------------- + liugeVo.setJiatingge(marriedVo); + //---------------------------------end---------------------------------- + + //-----新的将总格改为家庭格---------------------- + b_marriedVo.setJixiong(XMUtil.getJiXiong(number)); + b_marriedVo.setElement(fiveElementByNum); + b_marriedVo.setLiugeNum(number); + b_marriedVo.setLiuge("家庭格"); + fiveElementsVO.set(5, b_marriedVo); + //------------------end-------------------------- + +// System.out.println(); liugeVo.setStatus(status); liugeVo.setFiveElementsVOList(fiveElementsVO); // shuliJixiongService.selectLiugeContent(liugeVo); - shuliJixiongService.selectLiugeContent(liugeVo); + shuliJixiongService.selectLiugeContent(liugeVo, fiveElementsVO); //计算先天,后天 ShuliJixiong xiantian = shuliJixiongService.selectShuliJixiongById((long) liugeVo.getRenge().getNumber()); @@ -179,6 +256,12 @@ public class CalculateController extends BaseController { XMUtil.getElementByNum(liugeVo.getRenge().getNumber()), XMUtil.getElementByNum(liugeVo.getDige().getNumber()), liugeVo); +//--------------------------------------------------------end-------------------------------------------------------------------------- + + + + + } if (xmDto.getSource().equals("cs")) { @@ -218,7 +301,8 @@ public class CalculateController extends BaseController { if (newbiHuaList.size() == 3) { number = newbiHuaList.stream().reduce(0, Integer::sum); - number = number + 1; + //三字家庭格不加1 +// number = number + 1; tiange = newbiHuaList.get(0) + newbiHuaList.get(1); renge = newbiHuaList.get(1) + newbiHuaList.get(2); dige = newbiHuaList.get(2) + 1; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/PayController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/PayController.java index 615988f7..3457ac0c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/PayController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xmComtroller/PayController.java @@ -64,29 +64,24 @@ public class PayController extends BaseController { int predictCount = 1; if ("1".equals(type)) { // amount = 1L; - amount = 10000L; + amount = 5000L; orderTitle = "优惠购买"; predictCount = 50; } else if ("2".equals(type)) { - amount = 30000L; + amount = 9900L; // amount = 1L; orderTitle = "优惠购买"; - predictCount = 180; + predictCount = 0; } else if ("3".equals(type)) { - amount = 50000L; + amount = 29900L; // amount = 1L; - predictCount = 300; + predictCount = 0; orderTitle = "优惠购买"; } else if ("4".equals(type)) { - amount = 298000L; + amount = 49900L; // amount = 1L; predictCount = 0; orderTitle = "优惠购买"; - } else if ("5".equals(type)) { - amount = 498000L; -// amount = 1L; - orderTitle = "优惠购买"; - predictCount = 0; } else { return AjaxResult.error(); } @@ -119,7 +114,7 @@ public class PayController extends BaseController { model.setSubject("" + MCHNO + ""); model.setBody(orderTitle + "[" + MCHNO + "]"); - model.setNotifyUrl("http://62.234.19.34:8991/wxPay/result/wxRechargeCallback/"+type); //回调地址 + model.setNotifyUrl("http://62.234.19.34:8991/wxPay/result/wxRechargeCallback/" + type); //回调地址 model.setReturnUrl(""); model.setDivisionMode(divisionMode); //分账模式 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/XMUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/XMUtil.java index a88391ce..ef1b42f0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/XMUtil.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/XMUtil.java @@ -53,6 +53,7 @@ public class XMUtil { String m = xmDto.getMing(); nameMap.put("X",x); nameMap.put("M",m); + if (x.length() == 1 && m.length() == 1) { nameMap.put("TYPE", "DXDM"); } @@ -78,6 +79,75 @@ public class XMUtil { } return nameMap; } + /* + * 拆分姓名里面的姓和名 + * */ + public static Map getSurNameAndName(XmDto xmDto) { + Map nameMap = new HashMap<>(); + String name = xmDto.getName(); + String t_x = name.substring(0, 2); + String x; + String m; + if (Arrays.asList(SURNAME_NOW).contains(t_x)) { + x = t_x; + m = name.substring(2); + } + else{ + +// x = name.substring(0, 1); +// m = name.substring(1); + if(name.length() > 3){ + x = name.substring(0, 2); + m = name.substring(2); + + } + else{ + x = name.substring(0, 1); + m = name.substring(1); + } + } + +// String x = xmDto.getXing(); +// String m = xmDto.getMing(); + nameMap.put("X",x); + nameMap.put("M",m); + + if (x.length() == 1 && m.length() == 1) { + nameMap.put("TYPE", "DXDM"); + } + // + if (x.length() == 1 && m.length() >= 2) { + nameMap.put("TYPE", "DXFM"); + } +// // 姓一个字，名多于2个字的设置为 FXFM +// if (x.length() == 1 && m.length() > 2) { +// nameMap.put("TYPE", "FXFM"); +// } + + if (x.length() == 2 && m.length() == 1) { + boolean isInArray = Arrays.asList(SURNAME_NOW).contains(x); + if (isInArray){ + nameMap.put("TYPE", "FXDM"); + }else { + nameMap.put("TYPE", null); + + } + } + if (x.length() == 2 && m.length() == 2) { + + nameMap.put("TYPE", "FXFM"); + +// // 旧判断 +// boolean isInArray = Arrays.asList(SURNAME_NOW).contains(x); +// if (isInArray){ +// nameMap.put("TYPE", "FXFM"); +// }else { +// nameMap.put("TYPE", null); +// } + } + return nameMap; + } + /** * 往map里面添加 name的类型 dxdm，dxfm，fxdm，fxfm @@ -372,7 +442,8 @@ public class XMUtil { } - public static List getFiveElements(LiuGeVo liuGeVO) { + // 添加flag 0代表未婚，1代表结婚（这里总格应该变成家庭格） + public static List getFiveElements(LiuGeVo liuGeVO, int flag) { List resultList = new ArrayList<>(); int tiangeNum = liuGeVO.getTiange().getNumber(); String fiveElementByNum = getFiveElementByNum(tiangeNum); @@ -428,7 +499,12 @@ public class XMUtil { int zonggeNum = liuGeVO.getZongge().getNumber(); String fiveElementByNum5 = getFiveElementByNum(zonggeNum); FiveElementsVo fiveElementsVO5 = new FiveElementsVo(); - fiveElementsVO5.setLiuge("总格"); + if(flag==0){ + fiveElementsVO5.setLiuge("总格"); + } + else{ + fiveElementsVO5.setLiuge("家庭格"); + } fiveElementsVO5.setLiugeNum(zonggeNum); fiveElementsVO5.setElement(fiveElementByNum5); String zonggejx = getJiXiong(zonggeNum); diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index f1c0fefa..963d4aea 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -7,11 +7,11 @@ spring: druid: # 主库数据源 master: -# url: jdbc:mysql://localhost:3306/xingming?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - url: jdbc:mysql://172.17.0.3:3306/xingming?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false + url: jdbc:mysql://localhost:3306/xingming?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# url: jdbc:mysql://172.17.0.3:3306/xingming?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false username: root - password: dnxxkj -# password: root +# password: dnxxkj + password: root # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 723f67eb..560b43f4 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -70,8 +70,8 @@ spring: # redis 配置 redis: # 地址 - host: 172.17.0.4 -# host: localhost +# host: 172.17.0.4 + host: localhost # 端口，默认为6379 port: 6379 # 数据库索引 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/ShuliJixiong.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/ShuliJixiong.java index 3dd1afd3..94721893 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/ShuliJixiong.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/ShuliJixiong.java @@ -42,6 +42,12 @@ public class ShuliJixiong extends BaseEntity @Excel(name = "含义") private String hanyi; + + // 20241013 修改加上 wuxing，jixiong，两个字段。 + private String wuxing; + + private String jixiong; + public void setId(Long id) { this.id = id; @@ -106,6 +112,22 @@ public class ShuliJixiong extends BaseEntity return hanyi; } + public String getWuxing(){ + return wuxing; + } + + public void setWuxing(String wuxing){ + this.wuxing = wuxing; + } + + public String getJixiong(){ + return jixiong; + } + + public void setJixiong(String jixiong){ + this.jixiong = jixiong; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -116,6 +138,8 @@ public class ShuliJixiong extends BaseEntity .append("jiating", getJiating()) .append("jiankang", getJiankang()) .append("hanyi", getHanyi()) + .append("wuxing", getWuxing()) + .append("jixiong", getJixiong()) .toString(); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/XmDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/XmDto.java index a6dd2115..880262c5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/XmDto.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/XmDto.java @@ -8,6 +8,7 @@ public class XmDto { private String source; private String xing; private String ming; + private String fuxing; private int type; public List getBihuaList() { @@ -18,6 +19,13 @@ public class XmDto { this.bihuaList = bihuaList; } + public String getFuxing() { + return fuxing; + } + public void setFuxing(String fuxing) { + this.fuxing = fuxing; + } + public String getName() { return name; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/LiuGeVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/LiuGeVo.java index 4ca21523..4967bada 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/LiuGeVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/LiuGeVo.java @@ -1,6 +1,7 @@ package com.ruoyi.system.domain.vo; import com.ruoyi.system.domain.ShuliJixiong; +//import com.ruoyi.system.domain.vo.MarriedVo; import java.util.List; @@ -15,6 +16,9 @@ public class LiuGeVo { private GeEntity waige; private GeEntity tiange; private GeEntity biange; + // 添加家庭格 + private MarriedVo jiatingge; + private String xingge; @@ -222,10 +226,18 @@ public class LiuGeVo { this.biange = biange; } - public LiuGeVo() { + // 2024.10.12 添加设置家庭格 + public MarriedVo getJiatingge() { + return jiatingge; + } + public void setJiatingge(MarriedVo jiatingge) { + this.jiatingge = jiatingge; } - public LiuGeVo(String name, Long status, List bihuaList, GeEntity zongge, GeEntity dige, GeEntity renge, GeEntity waige, GeEntity tiange, GeEntity biange, String xingge, String x, String m, String TYPE, ShuliJixiong xiantian, ShuliJixiong houtian, String qingnian, String shaonian, String zhuangnian, String zhongnian, String laonian, String jiating, Long calculateNumber, List fiveElementsVOList) { + public LiuGeVo() { + } + // 初始化方法里加上家庭格 + public LiuGeVo(String name, Long status, List bihuaList, GeEntity zongge, GeEntity dige, GeEntity renge, GeEntity waige, GeEntity tiange, GeEntity biange,MarriedVo jiatingge,String xingge, String x, String m, String TYPE, ShuliJixiong xiantian, ShuliJixiong houtian, String qingnian, String shaonian, String zhuangnian, String zhongnian, String laonian, String jiating, Long calculateNumber, List fiveElementsVOList) { this.name = name; this.status = status; this.bihuaList = bihuaList; @@ -236,6 +248,7 @@ public class LiuGeVo { this.tiange = tiange; this.biange = biange; this.xingge = xingge; + this.jiatingge = jiatingge; X = x; M = m; this.TYPE = TYPE; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IShuliJixiongService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IShuliJixiongService.java index 4e920a9a..c88f67e3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IShuliJixiongService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IShuliJixiongService.java @@ -2,6 +2,7 @@ package com.ruoyi.system.service; import java.util.List; import com.ruoyi.system.domain.ShuliJixiong; +import com.ruoyi.system.domain.vo.FiveElementsVo; import com.ruoyi.system.domain.vo.LiuGeVo; /** @@ -60,5 +61,5 @@ public interface IShuliJixiongService */ public int deleteShuliJixiongById(Long id); - void selectLiugeContent(LiuGeVo liugeVo); + void selectLiugeContent(LiuGeVo liugeVo, List fiveElementsVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ShuliJixiongServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ShuliJixiongServiceImpl.java index a4153ae9..13d96632 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ShuliJixiongServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ShuliJixiongServiceImpl.java @@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl; import java.util.List; +import com.ruoyi.system.domain.vo.FiveElementsVo; import com.ruoyi.system.domain.vo.LiuGeVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -94,13 +95,43 @@ public class ShuliJixiongServiceImpl implements IShuliJixiongService } @Override - public void selectLiugeContent(LiuGeVo liugeVo) { + public void selectLiugeContent(LiuGeVo liugeVo, List fiveElementsVO) { ShuliJixiong tiange = shuliJixiongMapper.selectShuliJixiongById((long) liugeVo.getTiange().getNumber()); + + FiveElementsVo tiangeVo = fiveElementsVO.get(0); + tiange.setWuxing(tiangeVo.getElement()); + tiange.setJixiong(tiangeVo.getJixiong()); + ShuliJixiong renge = shuliJixiongMapper.selectShuliJixiongById((long) liugeVo.getRenge().getNumber()); + + FiveElementsVo rengeVo = fiveElementsVO.get(1); + renge.setWuxing(rengeVo.getElement()); + renge.setJixiong(rengeVo.getJixiong()); + ShuliJixiong dige = shuliJixiongMapper.selectShuliJixiongById((long) liugeVo.getDige().getNumber()); + + FiveElementsVo digeVo = fiveElementsVO.get(2); + dige.setWuxing(digeVo.getElement()); + dige.setJixiong(digeVo.getJixiong()); + ShuliJixiong waige = shuliJixiongMapper.selectShuliJixiongById((long) liugeVo.getWaige().getNumber()); + + FiveElementsVo waigeVo = fiveElementsVO.get(4); + waige.setWuxing(waigeVo.getElement()); + waige.setJixiong(waigeVo.getJixiong()); + ShuliJixiong zongge = shuliJixiongMapper.selectShuliJixiongById((long) liugeVo.getZongge().getNumber()); + + FiveElementsVo zonggeVo = fiveElementsVO.get(5); + zongge.setWuxing(zonggeVo.getElement()); + zongge.setJixiong(zonggeVo.getJixiong()); + ShuliJixiong biange = shuliJixiongMapper.selectShuliJixiongById((long) liugeVo.getBiange().getNumber()); + + FiveElementsVo biangeVo = fiveElementsVO.get(3); + biange.setWuxing(biangeVo.getElement()); + biange.setJixiong(biangeVo.getJixiong()); + liugeVo.getTiange().setShuliJixiong(tiange); liugeVo.getRenge().setShuliJixiong(renge); liugeVo.getDige().setShuliJixiong(dige);