xinyilu/xinelu-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update===>:修改用户名判重。

Browse Source
This commit is contained in:
haown 2023-11-16 17:21:01 +08:00
parent 07288359be
commit ef5003c5fa
2 changed files with 52 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java
View File

@ -19,27 +19,35 @@ import com.xinelu.common.enums.ConfirmRefundStatusEnum;
import com.xinelu.common.enums.GooodsOrderStatusEnum; import com.xinelu.common.enums.GooodsOrderStatusEnum;
import com.xinelu.common.enums.OrderSourceEnum; import com.xinelu.common.enums.OrderSourceEnum;
import com.xinelu.common.enums.OrderStatusEnum; import com.xinelu.common.enums.OrderStatusEnum;
import com.xinelu.common.enums.OrderTypeEnum;
import com.xinelu.common.utils.DateUtils; import com.xinelu.common.utils.DateUtils;
import com.xinelu.common.utils.http.HttpUtils; import com.xinelu.common.utils.http.HttpUtils;
import com.xinelu.common.utils.spring.SpringUtils; import com.xinelu.common.utils.spring.SpringUtils;
import com.xinelu.manage.domain.goodsOrder.GoodsOrder; import com.xinelu.manage.domain.goodsOrder.GoodsOrder;
import com.xinelu.manage.domain.hospitalinfo.HospitalInfo; import com.xinelu.manage.domain.hospitalinfo.HospitalInfo;
import com.xinelu.manage.domain.hospitalpersoninfo.HospitalPersonInfo; import com.xinelu.manage.domain.hospitalpersoninfo.HospitalPersonInfo;
import com.xinelu.manage.dto.consultationInfo.ConsultationInfoDTO;
import com.xinelu.manage.mapper.goodsOrder.GoodsOrderMapper; import com.xinelu.manage.mapper.goodsOrder.GoodsOrderMapper;
import com.xinelu.manage.service.consultationInfo.IConsultationInfoService;
import com.xinelu.manage.service.hospitalinfo.IHospitalInfoService; import com.xinelu.manage.service.hospitalinfo.IHospitalInfoService;
import com.xinelu.manage.service.hospitalpersoninfo.IHospitalPersonInfoService; import com.xinelu.manage.service.hospitalpersoninfo.IHospitalPersonInfoService;
import com.xinelu.manage.service.patientinfo.IPatientInfoService; import com.xinelu.manage.service.patientinfo.IPatientInfoService;
import com.xinelu.manage.vo.patientinfo.PatientInfoVO; import com.xinelu.manage.vo.patientinfo.PatientInfoVO;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
/** /**
* @Description 订单分页 * @Description 订单分页
* @Author ZhangHeng * @Author ZhangHeng
@ -61,6 +69,8 @@ public class NursingOrderServiceImpl implements INursingOrderService {
private IHospitalPersonInfoService hospitalPersonInfoService; private IHospitalPersonInfoService hospitalPersonInfoService;
@Resource @Resource
private IHospitalInfoService hospitalInfoService; private IHospitalInfoService hospitalInfoService;
@Resource
private IConsultationInfoService consultationInfoService;
/** /**
* 未评价标识 * 未评价标识
@ -232,6 +242,12 @@ public class NursingOrderServiceImpl implements INursingOrderService {
GoodsOrder goodsOrder = goodsOrderMapper.selectGoodsOrderById(orderId); GoodsOrder goodsOrder = goodsOrderMapper.selectGoodsOrderById(orderId);
HospitalPersonInfo hospitalPersonInfo = hospitalPersonInfoService.selectHospitalPersonInfoById(goodsOrder.getHospitalPersonId()); HospitalPersonInfo hospitalPersonInfo = hospitalPersonInfoService.selectHospitalPersonInfoById(goodsOrder.getHospitalPersonId());
HospitalInfo hospitalInfo = hospitalInfoService.selectHospitalInfoById(hospitalPersonInfo.getHospitalId()); HospitalInfo hospitalInfo = hospitalInfoService.selectHospitalInfoById(hospitalPersonInfo.getHospitalId());
if (StringUtils.equals(OrderTypeEnum.HEALTH_CONSULTATION.getInfo(), goodsOrder.getOrderType())) {
ConsultationInfoDTO consultationInfo = consultationInfoService.selectConsultationInfoById(goodsOrder.getConsultationInfoId());
result.put("sendTime", DateUtils.parseDateToStr("yyyy-MM-dd", consultationInfo.getAppointmentDate()) +" "+ consultationInfo.getAppointmentStartTime());
}else {
result.put("sendTime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", new Date()));
}
if (patient != null && goodsOrder != null) { if (patient != null && goodsOrder != null) {
// 组装发送消息通知参数 // 组装发送消息通知参数
result.put("patientId", patientId); result.put("patientId", patientId);
@ -241,7 +257,7 @@ public class NursingOrderServiceImpl implements INursingOrderService {
result.put("text2", "专家咨询"); result.put("text2", "专家咨询");
result.put("text3", "专家咨询"); result.put("text3", "专家咨询");
result.put("sendTitle", "专家咨询"); result.put("sendTitle", "专家咨询");
result.put("sendTime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", new Date()));
result.put("busType", "10"); result.put("busType", "10");
result.put("sendContent", patient.getPatientName() + "专家咨询预约成功"); result.put("sendContent", patient.getPatientName() + "专家咨询预约成功");
result.put("messageType", "5"); result.put("messageType", "5");

39
xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/impl/HospitalPersonInfoServiceImpl.java
View File

@ -18,6 +18,16 @@ import com.xinelu.manage.mapper.hospitalpersoninfo.HospitalPersonInfoMapper;
import com.xinelu.manage.service.hospitalpersoninfo.IHospitalPersonInfoService; import com.xinelu.manage.service.hospitalpersoninfo.IHospitalPersonInfoService;
import com.xinelu.manage.vo.hospitalpersoninfo.HospitalPersonInfoVO; import com.xinelu.manage.vo.hospitalpersoninfo.HospitalPersonInfoVO;
import com.xinelu.system.mapper.SysUserMapper; import com.xinelu.system.mapper.SysUserMapper;
import java.io.File;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.compress.utils.Lists; import org.apache.commons.compress.utils.Lists;
import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.BooleanUtils;
@ -25,13 +35,6 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.File;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
/** /**
* 健康咨询-科室人员信息Service业务层处理 * 健康咨询-科室人员信息Service业务层处理
* *
@ -137,7 +140,13 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
throw new ServiceException("新增科室人员资质证书信息失败，请联系管理员！"); throw new ServiceException("新增科室人员资质证书信息失败，请联系管理员！");
} }
} }
// 保存到sys_user表
// 判断用户名是否重复
int count = userMapper.checkUserNameUnique(hospitalPersonInfo.getPersonAccount());
if (count > 0) {
throw new ServiceException("已存在用户名为" + hospitalPersonInfo.getPersonAccount() +"的用户，请重新输入用户名");
}
// 保存到sys_user表
SysUser sysUser = new SysUser(); SysUser sysUser = new SysUser();
sysUser.setUserName(hospitalPersonInfo.getPersonAccount()); sysUser.setUserName(hospitalPersonInfo.getPersonAccount());
sysUser.setPassword(SecurityUtils.encryptPassword(hospitalPersonInfo.getPersonPassword())); sysUser.setPassword(SecurityUtils.encryptPassword(hospitalPersonInfo.getPersonPassword()));
@ -186,6 +195,11 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
sysUser.setHospitalPersonId(hospitalPersonInfo.getId()); sysUser.setHospitalPersonId(hospitalPersonInfo.getId());
List<SysUser> userList = userMapper.selectUserList(sysUser); List<SysUser> userList = userMapper.selectUserList(sysUser);
if (CollectionUtils.isEmpty(userList)) { if (CollectionUtils.isEmpty(userList)) {
// 判断用户名是否重复
int count = userMapper.checkUserNameUnique(hospitalPersonInfo.getPersonAccount());
if (count > 0) {
throw new ServiceException("已存在用户名为" + hospitalPersonInfo.getPersonAccount() +"的用户，请重新输入用户名");
}
SysUser newUser = new SysUser(); SysUser newUser = new SysUser();
newUser.setUserName(hospitalPersonInfo.getPersonAccount()); newUser.setUserName(hospitalPersonInfo.getPersonAccount());
newUser.setPassword(SecurityUtils.encryptPassword(hospitalPersonInfo.getPersonPassword())); newUser.setPassword(SecurityUtils.encryptPassword(hospitalPersonInfo.getPersonPassword()));
@ -196,7 +210,14 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
newUser.setDelFlag("0"); newUser.setDelFlag("0");
userMapper.insertUser(newUser); userMapper.insertUser(newUser);
} else { } else {
SysUser updUser = userList.get(0); // 用户名判重
int count = userMapper.checkUserNameUnique(hospitalPersonInfo.getPersonAccount());
if (count > 1) {
throw new ServiceException("已存在用户名为" + hospitalPersonInfo.getPersonAccount() +"的用户，请重新输入用户名");
}
// 修改用户信息
SysUser updUser = userList.get(0);
sysUser.setHospitalPersonId(hospitalPersonInfo.getId());
updUser.setUserName(hospitalPersonInfo.getPersonAccount()); updUser.setUserName(hospitalPersonInfo.getPersonAccount());
updUser.setPassword(SecurityUtils.encryptPassword(hospitalPersonInfo.getPersonPassword())); updUser.setPassword(SecurityUtils.encryptPassword(hospitalPersonInfo.getPersonPassword()));
updUser.setNickName(hospitalPersonInfo.getPersonName()); updUser.setNickName(hospitalPersonInfo.getPersonName());