yangjun
/
hldy_java_monomer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

长者入住流程

This commit is contained in:
1378012178@qq.com 2025-09-17 10:19:58 +08:00
parent 587be14c11
commit 4f9a50d54e
14 changed files with 151 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nursing-unit-admin/nu-admin-api/nu-admin-local-api/src/main/java/com/nu/modules/advisoryinfo/api/IAdvisoryInfoApi.java
View File

@ -18,4 +18,6 @@ public interface IAdvisoryInfoApi {
void editNuBizAdvisoryInfo(NuBizAdvisoryInfoEntity nuBizAdvisoryInfo); void editNuBizAdvisoryInfo(NuBizAdvisoryInfoEntity nuBizAdvisoryInfo);
String addGuardian(NuBizAdvisoryInfoEntity nuBizAdvisoryInfo); String addGuardian(NuBizAdvisoryInfoEntity nuBizAdvisoryInfo);
void changeClientType(String openId, String type);
} }

21
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/mapper/NuBizAdvisoryInfoMapper.java
View File

@ -1,21 +0,0 @@
package com.nu.modules.NuBizAdvisoryInfo.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.nu.modules.NuBizAdvisoryInfo.entity.NuBizAdvisoryInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 咨询信息
* @Author: 张明远
* @Date: 2025-04-07
* @Version: V1.0
*/
public interface NuBizAdvisoryInfoMapper extends BaseMapper<NuBizAdvisoryInfo> {
NuBizAdvisoryInfo getUserByTel(@Param("mobile") String mobile);
NuBizAdvisoryInfo findByOpenId(@Param("openId")String openId);
}

18
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/service/INuBizAdvisoryInfoService.java
View File

@ -1,18 +0,0 @@
package com.nu.modules.NuBizAdvisoryInfo.service;
import com.nu.modules.NuBizAdvisoryInfo.entity.NuBizAdvisoryInfo;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 咨询信息
* @Author: 张明远
* @Date: 2025-04-07
* @Version: V1.0
*/
public interface INuBizAdvisoryInfoService extends IService<NuBizAdvisoryInfo> {
NuBizAdvisoryInfo getUserByTel(String mobile);
NuBizAdvisoryInfo findByOpenId(String openId);
}

52
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/controller/NuBizAdvisoryInfoController.java → nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/advisoryinfo/controller/AdvisoryInfoController.java
View File

@ -1,39 +1,25 @@
package com.nu.modules.NuBizAdvisoryInfo.controller; package com.nu.modules.advisoryinfo.controller;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.common.system.query.QueryRuleEnum;
import org.jeecg.common.util.oConvertUtils; import com.nu.modules.advisoryinfo.entity.AdvisoryInfo;
import com.nu.modules.NuBizAdvisoryInfo.entity.NuBizAdvisoryInfo; import com.nu.modules.advisoryinfo.service.IAdvisoryInfoService;
import com.nu.modules.NuBizAdvisoryInfo.service.INuBizAdvisoryInfoService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
@ -49,9 +35,9 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
@RestController @RestController
@RequestMapping("/admin/NuBizAdvisoryInfo/nuBizAdvisoryInfo") @RequestMapping("/admin/NuBizAdvisoryInfo/nuBizAdvisoryInfo")
@Slf4j @Slf4j
public class NuBizAdvisoryInfoController extends JeecgController<NuBizAdvisoryInfo, INuBizAdvisoryInfoService> { public class AdvisoryInfoController extends JeecgController<AdvisoryInfo, IAdvisoryInfoService> {
@Autowired @Autowired
private INuBizAdvisoryInfoService nuBizAdvisoryInfoService; private IAdvisoryInfoService nuBizAdvisoryInfoService;
/** /**
* 分页列表查询 * 分页列表查询
@ -65,18 +51,18 @@ public class NuBizAdvisoryInfoController extends JeecgController<NuBizAdvisoryIn
//@AutoLog(value = "咨询信息-分页列表查询") //@AutoLog(value = "咨询信息-分页列表查询")
@ApiOperation(value="咨询信息-分页列表查询", notes="咨询信息-分页列表查询") @ApiOperation(value="咨询信息-分页列表查询", notes="咨询信息-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<NuBizAdvisoryInfo>> queryPageList(NuBizAdvisoryInfo nuBizAdvisoryInfo, public Result<IPage<AdvisoryInfo>> queryPageList(AdvisoryInfo nuBizAdvisoryInfo,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
// 自定义查询规则 // 自定义查询规则
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>(); Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
// 自定义多选的查询规则为：LIKE_WITH_OR // 自定义多选的查询规则为：LIKE_WITH_OR
customeRuleMap.put("advisoryType", QueryRuleEnum.LIKE_WITH_OR); customeRuleMap.put("advisoryType", QueryRuleEnum.LIKE_WITH_OR);
customeRuleMap.put("status", QueryRuleEnum.LIKE_WITH_OR); customeRuleMap.put("status", QueryRuleEnum.LIKE_WITH_OR);
QueryWrapper<NuBizAdvisoryInfo> queryWrapper = QueryGenerator.initQueryWrapper(nuBizAdvisoryInfo, req.getParameterMap(),customeRuleMap); QueryWrapper<AdvisoryInfo> queryWrapper = QueryGenerator.initQueryWrapper(nuBizAdvisoryInfo, req.getParameterMap(),customeRuleMap);
Page<NuBizAdvisoryInfo> page = new Page<NuBizAdvisoryInfo>(pageNo, pageSize); Page<AdvisoryInfo> page = new Page<AdvisoryInfo>(pageNo, pageSize);
IPage<NuBizAdvisoryInfo> pageList = nuBizAdvisoryInfoService.page(page, queryWrapper); IPage<AdvisoryInfo> pageList = nuBizAdvisoryInfoService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
} }
@ -89,7 +75,7 @@ public class NuBizAdvisoryInfoController extends JeecgController<NuBizAdvisoryIn
@AutoLog(value = "咨询信息-添加") @AutoLog(value = "咨询信息-添加")
@ApiOperation(value="咨询信息-添加", notes="咨询信息-添加") @ApiOperation(value="咨询信息-添加", notes="咨询信息-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<Object> add(@RequestBody NuBizAdvisoryInfo nuBizAdvisoryInfo) { public Result<Object> add(@RequestBody AdvisoryInfo nuBizAdvisoryInfo) {
nuBizAdvisoryInfoService.save(nuBizAdvisoryInfo); nuBizAdvisoryInfoService.save(nuBizAdvisoryInfo);
return Result.OK(nuBizAdvisoryInfo); return Result.OK(nuBizAdvisoryInfo);
} }
@ -104,7 +90,7 @@ public class NuBizAdvisoryInfoController extends JeecgController<NuBizAdvisoryIn
@ApiOperation(value="咨询信息-编辑", notes="咨询信息-编辑") @ApiOperation(value="咨询信息-编辑", notes="咨询信息-编辑")
@RequiresPermissions("NuBizAdvisoryInfo:nu_biz_advisory_info:edit") @RequiresPermissions("NuBizAdvisoryInfo:nu_biz_advisory_info:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody NuBizAdvisoryInfo nuBizAdvisoryInfo) { public Result<String> edit(@RequestBody AdvisoryInfo nuBizAdvisoryInfo) {
nuBizAdvisoryInfoService.updateById(nuBizAdvisoryInfo); nuBizAdvisoryInfoService.updateById(nuBizAdvisoryInfo);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");
} }
@ -148,8 +134,8 @@ public class NuBizAdvisoryInfoController extends JeecgController<NuBizAdvisoryIn
//@AutoLog(value = "咨询信息-通过id查询") //@AutoLog(value = "咨询信息-通过id查询")
@ApiOperation(value="咨询信息-通过id查询", notes="咨询信息-通过id查询") @ApiOperation(value="咨询信息-通过id查询", notes="咨询信息-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<NuBizAdvisoryInfo> queryById(@RequestParam(name="id",required=true) String id) { public Result<AdvisoryInfo> queryById(@RequestParam(name="id",required=true) String id) {
NuBizAdvisoryInfo nuBizAdvisoryInfo = nuBizAdvisoryInfoService.getById(id); AdvisoryInfo nuBizAdvisoryInfo = nuBizAdvisoryInfoService.getById(id);
if(nuBizAdvisoryInfo==null) { if(nuBizAdvisoryInfo==null) {
return Result.error("未找到对应数据"); return Result.error("未找到对应数据");
} }
@ -164,8 +150,8 @@ public class NuBizAdvisoryInfoController extends JeecgController<NuBizAdvisoryIn
*/ */
@RequiresPermissions("NuBizAdvisoryInfo:nu_biz_advisory_info:exportXls") @RequiresPermissions("NuBizAdvisoryInfo:nu_biz_advisory_info:exportXls")
@RequestMapping(value = "/exportXls") @RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, NuBizAdvisoryInfo nuBizAdvisoryInfo) { public ModelAndView exportXls(HttpServletRequest request, AdvisoryInfo nuBizAdvisoryInfo) {
return super.exportXls(request, nuBizAdvisoryInfo, NuBizAdvisoryInfo.class, "咨询信息"); return super.exportXls(request, nuBizAdvisoryInfo, AdvisoryInfo.class, "咨询信息");
} }
/** /**
@ -178,7 +164,7 @@ public class NuBizAdvisoryInfoController extends JeecgController<NuBizAdvisoryIn
@RequiresPermissions("NuBizAdvisoryInfo:nu_biz_advisory_info:importExcel") @RequiresPermissions("NuBizAdvisoryInfo:nu_biz_advisory_info:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST) @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, NuBizAdvisoryInfo.class); return super.importExcel(request, response, AdvisoryInfo.class);
} }
} }

10
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/entity/NuBizAdvisoryInfo.java → nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/advisoryinfo/entity/AdvisoryInfo.java
View File

@ -1,15 +1,9 @@
package com.nu.modules.NuBizAdvisoryInfo.entity; package com.nu.modules.advisoryinfo.entity;
import java.io.Serializable; import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.ProvinceCityArea;
import org.jeecg.common.util.SpringContextUtils;
import lombok.Data; import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
@ -31,7 +25,7 @@ import lombok.experimental.Accessors;
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_biz_advisory_info对象", description="咨询信息") @ApiModel(value="nu_biz_advisory_info对象", description="咨询信息")
public class NuBizAdvisoryInfo implements Serializable { public class AdvisoryInfo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**id*/ /**id*/

19
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/advisoryinfo/mapper/AdvisoryInfoMapper.java Normal file
View File

@ -0,0 +1,19 @@
package com.nu.modules.advisoryinfo.mapper;
import org.apache.ibatis.annotations.Param;
import com.nu.modules.advisoryinfo.entity.AdvisoryInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 咨询信息
* @Author: 张明远
* @Date: 2025-04-07
* @Version: V1.0
*/
public interface AdvisoryInfoMapper extends BaseMapper<AdvisoryInfo> {
AdvisoryInfo getUserByTel(@Param("mobile") String mobile);
AdvisoryInfo findByOpenId(@Param("openId")String openId);
}

6
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/mapper/xml/NuBizAdvisoryInfoMapper.xml → nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/advisoryinfo/mapper/xml/AdvisoryInfoMapper.xml
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.NuBizAdvisoryInfo.mapper.NuBizAdvisoryInfoMapper"> <mapper namespace="com.nu.modules.advisoryinfo.mapper.AdvisoryInfoMapper">
<select id="getUserByTel" resultType="com.nu.modules.NuBizAdvisoryInfo.entity.NuBizAdvisoryInfo"> <select id="getUserByTel" resultType="com.nu.modules.advisoryinfo.entity.AdvisoryInfo">
select * from nu_biz_advisory_info where tel=#{mobile} select * from nu_biz_advisory_info where tel=#{mobile}
</select> </select>
<select id="findByOpenId" resultType="com.nu.modules.NuBizAdvisoryInfo.entity.NuBizAdvisoryInfo"> <select id="findByOpenId" resultType="com.nu.modules.advisoryinfo.entity.AdvisoryInfo">
select * from nu_biz_advisory_info where open_id=#{openId} select * from nu_biz_advisory_info where open_id=#{openId}
</select> </select>

18
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/advisoryinfo/service/IAdvisoryInfoService.java Normal file
View File

@ -0,0 +1,18 @@
package com.nu.modules.advisoryinfo.service;
import com.nu.modules.advisoryinfo.entity.AdvisoryInfo;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 咨询信息
* @Author: 张明远
* @Date: 2025-04-07
* @Version: V1.0
*/
public interface IAdvisoryInfoService extends IService<AdvisoryInfo> {
AdvisoryInfo getUserByTel(String mobile);
AdvisoryInfo findByOpenId(String openId);
}

70
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/NuBizAdvisoryInfo/service/impl/NuBizAdvisoryInfoServiceImpl.java → nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/advisoryinfo/service/impl/AdvisoryInfoServiceImpl.java
View File

@ -1,12 +1,12 @@
package com.nu.modules.NuBizAdvisoryInfo.service.impl; package com.nu.modules.advisoryinfo.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.entity.NuBizAdvisoryInfoEntity; import com.nu.entity.NuBizAdvisoryInfoEntity;
import com.nu.modules.NuBizAdvisoryInfo.entity.NuBizAdvisoryInfo; import com.nu.modules.advisoryinfo.entity.AdvisoryInfo;
import com.nu.modules.NuBizAdvisoryInfo.mapper.NuBizAdvisoryInfoMapper; import com.nu.modules.advisoryinfo.mapper.AdvisoryInfoMapper;
import com.nu.modules.NuBizAdvisoryInfo.service.INuBizAdvisoryInfoService; import com.nu.modules.advisoryinfo.service.IAdvisoryInfoService;
import com.nu.modules.advisoryinfo.api.IAdvisoryInfoApi; import com.nu.modules.advisoryinfo.api.IAdvisoryInfoApi;
import com.nu.modules.advisoryinfo.entity.AdvisoryInfoEntity; import com.nu.modules.advisoryinfo.entity.AdvisoryInfoEntity;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@ -29,7 +29,7 @@ import java.time.format.DateTimeFormatter;
* @Version: V1.0 * @Version: V1.0
*/ */
@Service @Service
public class NuBizAdvisoryInfoServiceImpl extends ServiceImpl<NuBizAdvisoryInfoMapper, NuBizAdvisoryInfo> implements INuBizAdvisoryInfoService, IAdvisoryInfoApi { public class AdvisoryInfoServiceImpl extends ServiceImpl<AdvisoryInfoMapper, AdvisoryInfo> implements IAdvisoryInfoService, IAdvisoryInfoApi {
@Autowired @Autowired
private RedisUtil redisUtil; private RedisUtil redisUtil;
@ -39,21 +39,21 @@ public class NuBizAdvisoryInfoServiceImpl extends ServiceImpl<NuBizAdvisoryInfoM
@Override @Override
public NuBizAdvisoryInfoEntity queryWeixinInfo(String openId, String wechatName) { public NuBizAdvisoryInfoEntity queryWeixinInfo(String openId, String wechatName) {
QueryWrapper<NuBizAdvisoryInfo> queryWrapper = new QueryWrapper<>(); QueryWrapper<AdvisoryInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("open_id", openId); queryWrapper.eq("open_id", openId);
queryWrapper.eq(StringUtils.isNotBlank(wechatName), "wechat_name", wechatName); queryWrapper.eq(StringUtils.isNotBlank(wechatName), "wechat_name", wechatName);
NuBizAdvisoryInfo nuBizAdvisoryInfo = baseMapper.selectOne(queryWrapper); AdvisoryInfo nuBizAdvisoryInfo = baseMapper.selectOne(queryWrapper);
//查询是否有微信注册信息，没有则创建 //查询是否有微信注册信息，没有则创建
if (nuBizAdvisoryInfo == null) { if (nuBizAdvisoryInfo == null) {
nuBizAdvisoryInfo = new NuBizAdvisoryInfo(); nuBizAdvisoryInfo = new AdvisoryInfo();
nuBizAdvisoryInfo.setOpenId(openId); nuBizAdvisoryInfo.setOpenId(openId);
nuBizAdvisoryInfo.setWechatName(wechatName); nuBizAdvisoryInfo.setWechatName(wechatName);
baseMapper.insert(nuBizAdvisoryInfo); baseMapper.insert(nuBizAdvisoryInfo);
QueryWrapper<NuBizAdvisoryInfo> qw = new QueryWrapper<>(); QueryWrapper<AdvisoryInfo> qw = new QueryWrapper<>();
qw.orderByDesc("plat_id"); qw.orderByDesc("plat_id");
qw.last("limit 1"); qw.last("limit 1");
NuBizAdvisoryInfo info = baseMapper.selectOne(qw); AdvisoryInfo info = baseMapper.selectOne(qw);
if (info.getPlatId() == null) { if (info.getPlatId() == null) {
System.out.println(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + "000001"); System.out.println(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + "000001");
System.out.println(Long.parseLong(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + "000001")); System.out.println(Long.parseLong(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + "000001"));
@ -78,9 +78,9 @@ public class NuBizAdvisoryInfoServiceImpl extends ServiceImpl<NuBizAdvisoryInfoM
@Override @Override
public void editNuBizAdvisoryInfo(NuBizAdvisoryInfoEntity advisoryInfoDto) { public void editNuBizAdvisoryInfo(NuBizAdvisoryInfoEntity advisoryInfoDto) {
UpdateWrapper<NuBizAdvisoryInfo> uw = new UpdateWrapper<>(); UpdateWrapper<AdvisoryInfo> uw = new UpdateWrapper<>();
uw.eq("open_id",advisoryInfoDto.getOpenId()); uw.eq("open_id",advisoryInfoDto.getOpenId());
NuBizAdvisoryInfo upData = new NuBizAdvisoryInfo(); AdvisoryInfo upData = new AdvisoryInfo();
upData.setAvatar(advisoryInfoDto.getAvatar());//改头像 upData.setAvatar(advisoryInfoDto.getAvatar());//改头像
upData.setNickName(advisoryInfoDto.getNickName());//改昵称 upData.setNickName(advisoryInfoDto.getNickName());//改昵称
upData.setName(advisoryInfoDto.getName());//咨询人姓名 upData.setName(advisoryInfoDto.getName());//咨询人姓名
@ -93,37 +93,49 @@ public class NuBizAdvisoryInfoServiceImpl extends ServiceImpl<NuBizAdvisoryInfoM
@Override @Override
public String addGuardian(NuBizAdvisoryInfoEntity advisoryInfoDto) { public String addGuardian(NuBizAdvisoryInfoEntity advisoryInfoDto) {
QueryWrapper<NuBizAdvisoryInfo> qw = new QueryWrapper<>(); QueryWrapper<AdvisoryInfo> qw = new QueryWrapper<>();
qw.eq("open_id",advisoryInfoDto.getOpenId()); qw.eq("open_id",advisoryInfoDto.getOpenId());
NuBizAdvisoryInfo one = baseMapper.selectOne(qw); AdvisoryInfo one = baseMapper.selectOne(qw);
NuBizAdvisoryInfo advisoryInfo = new NuBizAdvisoryInfo(); AdvisoryInfo advisoryInfo = new AdvisoryInfo();
BeanUtils.copyProperties(advisoryInfoDto,advisoryInfo); BeanUtils.copyProperties(advisoryInfoDto,advisoryInfo);
if(one == null){ if(one == null){
baseMapper.insert(advisoryInfo); baseMapper.insert(advisoryInfo);
return advisoryInfo.getId(); return advisoryInfo.getId();
}else{ }else{
UpdateWrapper<NuBizAdvisoryInfo> uw = new UpdateWrapper<>(); UpdateWrapper<AdvisoryInfo> uw = new UpdateWrapper<>();
uw.eq("open_id",advisoryInfoDto.getOpenId()); uw.eq("open_id",advisoryInfoDto.getOpenId());
NuBizAdvisoryInfo upData = new NuBizAdvisoryInfo(); AdvisoryInfo upData = new AdvisoryInfo();
upData.setName(advisoryInfoDto.getName());//咨询人姓名 upData.setName(advisoryInfoDto.getName());//咨询人姓名
upData.setIdCard(advisoryInfoDto.getIdCard());//身份证号 upData.setIdCard(advisoryInfoDto.getIdCard());//身份证号
upData.setTel(advisoryInfoDto.getTel());//电话号 upData.setTel(advisoryInfoDto.getTel());//电话号
upData.setHomeAddress(advisoryInfoDto.getHomeAddress());//家庭住址 upData.setHomeAddress(advisoryInfoDto.getHomeAddress());//家庭住址
upData.setWorkUnit(advisoryInfoDto.getWorkUnit());//工作单位 upData.setWorkUnit(advisoryInfoDto.getWorkUnit());//工作单位
upData.setIzJs("1"); upData.setStatus("2");//无审核 - 即审核直接通过
upData.setIzJs("1");//给予家属身份
upData.setAdvisoryType("1");//切换默认登录端为长者端
baseMapper.update(upData,uw); baseMapper.update(upData,uw);
return null; return null;
} }
} }
@Override
public void changeClientType(String openId, String type) {
AdvisoryInfo advisoryInfo = new AdvisoryInfo();
advisoryInfo.setAdvisoryType(type);
UpdateWrapper<AdvisoryInfo> uw = new UpdateWrapper<>();
uw.eq("open_id",openId);
baseMapper.update(advisoryInfo,uw);
}
/** /**
* 用户信息 * 用户信息
* *
* @param sysUser * @param sysUser
* @return * @return
*/ */
private String userInfo(NuBizAdvisoryInfo sysUser) { private String userInfo(AdvisoryInfo sysUser) {
String username = sysUser.getOpenId(); String username = sysUser.getOpenId();
String syspassword = sysUser.getTel(); String syspassword = sysUser.getTel();
//1.生成token //1.生成token
@ -135,23 +147,23 @@ public class NuBizAdvisoryInfoServiceImpl extends ServiceImpl<NuBizAdvisoryInfoM
@Override @Override
public NuBizAdvisoryInfo getUserByTel(String mobile) { public AdvisoryInfo getUserByTel(String mobile) {
return baseMapper.getUserByTel(mobile); return baseMapper.getUserByTel(mobile);
} }
@Override @Override
public NuBizAdvisoryInfo findByOpenId(String openId) { public AdvisoryInfo findByOpenId(String openId) {
return baseMapper.findByOpenId(openId); return baseMapper.findByOpenId(openId);
} }
@Override @Override
public void handlePlatId(NuBizAdvisoryInfoEntity nuBizAdvisoryInfo) { public void handlePlatId(NuBizAdvisoryInfoEntity nuBizAdvisoryInfo) {
NuBizAdvisoryInfo advisoryInfo = new NuBizAdvisoryInfo(); AdvisoryInfo advisoryInfo = new AdvisoryInfo();
BeanUtils.copyProperties(nuBizAdvisoryInfo,advisoryInfo); BeanUtils.copyProperties(nuBizAdvisoryInfo,advisoryInfo);
QueryWrapper<NuBizAdvisoryInfo> qw = new QueryWrapper<>(); QueryWrapper<AdvisoryInfo> qw = new QueryWrapper<>();
qw.orderByDesc("plat_id"); qw.orderByDesc("plat_id");
qw.last("limit 1"); qw.last("limit 1");
NuBizAdvisoryInfo info = baseMapper.selectOne(qw); AdvisoryInfo info = baseMapper.selectOne(qw);
if (info.getPlatId() == null) { if (info.getPlatId() == null) {
System.out.println(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + "000001"); System.out.println(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + "000001");
System.out.println(Long.parseLong(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + "000001")); System.out.println(Long.parseLong(LocalDate.now().format(DateTimeFormatter.ofPattern("yyMM")) + "000001"));
@ -167,9 +179,9 @@ public class NuBizAdvisoryInfoServiceImpl extends ServiceImpl<NuBizAdvisoryInfoM
@Override @Override
public NuBizAdvisoryInfoEntity queryByOpenId(String openId) { public NuBizAdvisoryInfoEntity queryByOpenId(String openId) {
QueryWrapper<NuBizAdvisoryInfo> queryWrapper = new QueryWrapper<>(); QueryWrapper<AdvisoryInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("open_id",openId); queryWrapper.eq("open_id",openId);
NuBizAdvisoryInfo nuBizAdvisoryInfo = baseMapper.selectOne(queryWrapper); AdvisoryInfo nuBizAdvisoryInfo = baseMapper.selectOne(queryWrapper);
if(nuBizAdvisoryInfo==null) { if(nuBizAdvisoryInfo==null) {
return null; return null;
} }
@ -196,9 +208,9 @@ public class NuBizAdvisoryInfoServiceImpl extends ServiceImpl<NuBizAdvisoryInfoM
@Override @Override
public AdvisoryInfoEntity getAdvisoryInfo(String tel) { public AdvisoryInfoEntity getAdvisoryInfo(String tel) {
QueryWrapper<NuBizAdvisoryInfo> qw = new QueryWrapper<>(); QueryWrapper<AdvisoryInfo> qw = new QueryWrapper<>();
qw.eq("tel", tel); qw.eq("tel", tel);
NuBizAdvisoryInfo nuBizAdvisoryInfo = baseMapper.selectOne(qw); AdvisoryInfo nuBizAdvisoryInfo = baseMapper.selectOne(qw);
if (nuBizAdvisoryInfo != null) { if (nuBizAdvisoryInfo != null) {
AdvisoryInfoEntity advisoryInfoEntity = new AdvisoryInfoEntity(); AdvisoryInfoEntity advisoryInfoEntity = new AdvisoryInfoEntity();
BeanUtils.copyProperties(nuBizAdvisoryInfo, advisoryInfoEntity); BeanUtils.copyProperties(nuBizAdvisoryInfo, advisoryInfoEntity);
@ -210,7 +222,7 @@ public class NuBizAdvisoryInfoServiceImpl extends ServiceImpl<NuBizAdvisoryInfoM
@Override @Override
public void saveData(NuBizAdvisoryInfoEntity nuBizAdvisoryInfo) { public void saveData(NuBizAdvisoryInfoEntity nuBizAdvisoryInfo) {
NuBizAdvisoryInfo advisoryInfo = new NuBizAdvisoryInfo(); AdvisoryInfo advisoryInfo = new AdvisoryInfo();
BeanUtils.copyProperties(nuBizAdvisoryInfo,advisoryInfo); BeanUtils.copyProperties(nuBizAdvisoryInfo,advisoryInfo);
baseMapper.insert(advisoryInfo); baseMapper.insert(advisoryInfo);
} }

6
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/weixin/controller/WeixinController.java
View File

@ -108,8 +108,8 @@ public class WeixinController {
System.out.println("-------------------33333333333333----------"); System.out.println("-------------------33333333333333----------");
JsonNode tokenNode = objectMapper.readTree(tokenResponse); JsonNode tokenNode = objectMapper.readTree(tokenResponse);
System.out.println("-------------------444444444444444----------"+tokenNode); System.out.println("-------------------444444444444444----------"+tokenNode);
// accessToken = tokenNode.get("session_key").asText(); accessToken = tokenNode.get("session_key").asText();
// System.out.println("-------------------55555555555555----------"+accessToken); System.out.println("-------------------55555555555555----------"+accessToken);
// String openId = tokenNode.get("openid").asText(); // String openId = tokenNode.get("openid").asText();
// System.out.println("-------------------666666666666666----------"+openId); // System.out.println("-------------------666666666666666----------"+openId);
// //
@ -129,7 +129,7 @@ public class WeixinController {
// model.addAttribute("nickname", userInfoNode.get("nickname").asText()); // model.addAttribute("nickname", userInfoNode.get("nickname").asText());
// model.addAttribute("headimgurl", userInfoNode.get("headimgurl").asText()); // model.addAttribute("headimgurl", userInfoNode.get("headimgurl").asText());
// model.addAttribute("code", code); // model.addAttribute("code", code);
retJson = tokenNode; // retJson = tokenNode;
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
model.addAttribute("openid", "Error parsing JSON response"); model.addAttribute("openid", "Error parsing JSON response");

10
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/NuBizAdvisoryInfo/listener/NuBizAdvisoryInfoListener.java
View File

@ -1,8 +1,8 @@
package com.nu.mq.NuBizAdvisoryInfo.listener; package com.nu.mq.NuBizAdvisoryInfo.listener;
import com.nu.entity.NuBizAdvisoryInfoEntity; import com.nu.entity.NuBizAdvisoryInfoEntity;
import com.nu.modules.NuBizAdvisoryInfo.entity.NuBizAdvisoryInfo; import com.nu.modules.advisoryinfo.entity.AdvisoryInfo;
import com.nu.modules.NuBizAdvisoryInfo.service.INuBizAdvisoryInfoService; import com.nu.modules.advisoryinfo.service.IAdvisoryInfoService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
@ -13,12 +13,12 @@ import org.springframework.stereotype.Component;
@Component @Component
public class NuBizAdvisoryInfoListener { public class NuBizAdvisoryInfoListener {
@Autowired @Autowired
private INuBizAdvisoryInfoService nuBizAdvisoryInfoService; private IAdvisoryInfoService nuBizAdvisoryInfoService;
@RabbitListener(queues = "register.addData", errorHandler = "AdvisoryMQExceptionHandler") @RabbitListener(queues = "register.addData", errorHandler = "AdvisoryMQExceptionHandler")
public void registerAddMessage(NuBizAdvisoryInfoEntity dto) { public void registerAddMessage(NuBizAdvisoryInfoEntity dto) {
try { try {
System.out.println(111); System.out.println(111);
NuBizAdvisoryInfo nuBizAdvisoryInfo = new NuBizAdvisoryInfo(); AdvisoryInfo nuBizAdvisoryInfo = new AdvisoryInfo();
BeanUtils.copyProperties(dto,nuBizAdvisoryInfo); BeanUtils.copyProperties(dto,nuBizAdvisoryInfo);
nuBizAdvisoryInfoService.save(nuBizAdvisoryInfo); nuBizAdvisoryInfoService.save(nuBizAdvisoryInfo);
} catch (Exception e) { } catch (Exception e) {
@ -30,7 +30,7 @@ public class NuBizAdvisoryInfoListener {
@RabbitListener(queues = "register.editData", errorHandler = "AdvisoryMQExceptionHandler") @RabbitListener(queues = "register.editData", errorHandler = "AdvisoryMQExceptionHandler")
public void registerEditMessage(NuBizAdvisoryInfoEntity dto) { public void registerEditMessage(NuBizAdvisoryInfoEntity dto) {
try { try {
NuBizAdvisoryInfo nuBizAdvisoryInfo = new NuBizAdvisoryInfo(); AdvisoryInfo nuBizAdvisoryInfo = new AdvisoryInfo();
BeanUtils.copyProperties(dto,nuBizAdvisoryInfo); BeanUtils.copyProperties(dto,nuBizAdvisoryInfo);
nuBizAdvisoryInfoService.updateById(nuBizAdvisoryInfo); nuBizAdvisoryInfoService.updateById(nuBizAdvisoryInfo);
} catch (Exception e) { } catch (Exception e) {

31
nursing-unit-api/src/main/java/com/nu/modules/wechat/advisoryinfo/api/AdvisoryInfoApi.java Normal file
View File

@ -0,0 +1,31 @@
package com.nu.modules.wechat.advisoryinfo.api;
import com.nu.modules.advisoryinfo.api.IAdvisoryInfoApi;
import io.swagger.annotations.Api;
import org.jeecg.common.api.vo.Result;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@Api(tags = "咨询信息")
@RestController
@RequestMapping("/api/advisoryInfo")
public class AdvisoryInfoApi {
@Autowired
private IAdvisoryInfoApi advisoryInfoApi;
/**
* 变更用户登录后默认的客户端类型
* @param openId
* @param type
* @return
*/
@PutMapping("/changeClientType")
public Result<?> changeClientType(@RequestParam("openId") String openId, @RequestParam("type") String type) {
advisoryInfoApi.changeClientType(openId, type);
return Result.ok();
}
}

2
nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java
View File

@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
@Api(tags = "咨询信息") @Api(tags = "长者信息")
@RestController @RestController
@RequestMapping("/api/elderInfo") @RequestMapping("/api/elderInfo")
public class ElderApi { public class ElderApi {

15
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
View File

@ -6,8 +6,8 @@ import com.aliyuncs.exceptions.ClientException;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.nu.modules.NuBizAdvisoryInfo.entity.NuBizAdvisoryInfo; import com.nu.modules.advisoryinfo.entity.AdvisoryInfo;
import com.nu.modules.NuBizAdvisoryInfo.service.INuBizAdvisoryInfoService; import com.nu.modules.advisoryinfo.service.IAdvisoryInfoService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -31,7 +31,6 @@ import org.jeecg.modules.system.model.SysLoginModel;
import org.jeecg.modules.system.service.*; import org.jeecg.modules.system.service.*;
import org.jeecg.modules.system.service.impl.SysBaseApiImpl; import org.jeecg.modules.system.service.impl.SysBaseApiImpl;
import org.jeecg.modules.system.util.RandImageUtil; import org.jeecg.modules.system.util.RandImageUtil;
import org.jeecg.modules.system.service.*;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
@ -70,7 +69,7 @@ public class LoginController {
@Autowired @Autowired
private JeecgBaseConfig jeecgBaseConfig; private JeecgBaseConfig jeecgBaseConfig;
@Autowired @Autowired
private INuBizAdvisoryInfoService nuBizAdvisoryInfoService; private IAdvisoryInfoService nuBizAdvisoryInfoService;
private final String BASE_CHECK_CODES = "qwertyuiplkjhgfdsazxcvbnmQWERTYUPLKJHGFDSAZXCVBNM1234567890"; private final String BASE_CHECK_CODES = "qwertyuiplkjhgfdsazxcvbnmQWERTYUPLKJHGFDSAZXCVBNM1234567890";
@ -927,7 +926,7 @@ public class LoginController {
boolean b = false; boolean b = false;
//注册模板 //注册模板
if (CommonConstant.SMS_TPL_TYPE_1.equals(smsmode)) { if (CommonConstant.SMS_TPL_TYPE_1.equals(smsmode)) {
NuBizAdvisoryInfo nuBizAdvisoryInfo = nuBizAdvisoryInfoService.getUserByTel(mobile); AdvisoryInfo nuBizAdvisoryInfo = nuBizAdvisoryInfoService.getUserByTel(mobile);
if(nuBizAdvisoryInfo!=null) { if(nuBizAdvisoryInfo!=null) {
result.error500(" 手机号已经注册，无法继续使用！"); result.error500(" 手机号已经注册，无法继续使用！");
baseCommonService.addLog("手机号已经注册，无法继续使用！", CommonConstant.LOG_TYPE_1, null); baseCommonService.addLog("手机号已经注册，无法继续使用！", CommonConstant.LOG_TYPE_1, null);
@ -936,7 +935,7 @@ public class LoginController {
b = DySmsHelper.sendSms(mobile, obj, DySmsEnum.REGISTER_TEMPLATE_CODE); b = DySmsHelper.sendSms(mobile, obj, DySmsEnum.REGISTER_TEMPLATE_CODE);
}else { }else {
//登录模式，校验用户有效性 //登录模式，校验用户有效性
NuBizAdvisoryInfo nuBizAdvisoryInfo = nuBizAdvisoryInfoService.getUserByTel(mobile); AdvisoryInfo nuBizAdvisoryInfo = nuBizAdvisoryInfoService.getUserByTel(mobile);
// SysUser sysUser = sysUserService.getUserByPhone(mobile); // SysUser sysUser = sysUserService.getUserByPhone(mobile);
// result = sysUserService.checkUserIsEffective(sysUser); // result = sysUserService.checkUserIsEffective(sysUser);
@ -1015,10 +1014,10 @@ public class LoginController {
addLoginFailOvertimes(phone); addLoginFailOvertimes(phone);
return Result.error("手机验证码错误"); return Result.error("手机验证码错误");
} }
QueryWrapper<NuBizAdvisoryInfo> queryWrapper = new QueryWrapper<>(); QueryWrapper<AdvisoryInfo> queryWrapper = new QueryWrapper<>();
System.out.println("openId = " + openId); System.out.println("openId = " + openId);
queryWrapper.eq("open_id", openId); queryWrapper.eq("open_id", openId);
NuBizAdvisoryInfo nuBizAdvisoryInfo = nuBizAdvisoryInfoService.getOne(queryWrapper); AdvisoryInfo nuBizAdvisoryInfo = nuBizAdvisoryInfoService.getOne(queryWrapper);
nuBizAdvisoryInfo.setTel(phone); nuBizAdvisoryInfo.setTel(phone);
nuBizAdvisoryInfoService.updateById(nuBizAdvisoryInfo); nuBizAdvisoryInfoService.updateById(nuBizAdvisoryInfo);