From bdc56ebc9534620766d787a1dacb4c962ea10797 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Tue, 16 Jun 2020 10:36:35 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 369 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 346 insertions(+), 23 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
index 857b953..5dc3489 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -5,25 +5,27 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.constant.CommonConstant;
+import com.kidgrow.common.constant.DictionariesConstants;
import com.kidgrow.common.constant.SecurityConstants;
import com.kidgrow.common.context.ClientContextHolder;
import com.kidgrow.common.lock.DistributedLock;
+import com.kidgrow.common.model.SysMenu;
+import com.kidgrow.common.model.SysRole;
+import com.kidgrow.common.model.SysUser;
import com.kidgrow.common.model.*;
import com.kidgrow.common.service.impl.SuperServiceImpl;
import com.kidgrow.common.utils.DateUtils;
import com.kidgrow.redis.util.RedisUtils;
import com.kidgrow.sms.feign.SmsChuangLanService;
import com.kidgrow.sms.model.ConstantSMS;
+import com.kidgrow.usercenter.mapper.SysDoctorMapper;
import com.kidgrow.usercenter.mapper.SysRoleMenuMapper;
import com.kidgrow.usercenter.mapper.SysUserMapper;
-import com.kidgrow.usercenter.model.SysRoleUser;
-import com.kidgrow.usercenter.model.SysUserExcel;
-import com.kidgrow.usercenter.service.ISysOrganizationService;
-import com.kidgrow.usercenter.service.ISysRoleUserService;
-import com.kidgrow.usercenter.service.ISysUserOrgService;
-import com.kidgrow.usercenter.service.ISysUserService;
+import com.kidgrow.usercenter.model.SysDoctor;
+import com.kidgrow.usercenter.model.*;
+import com.kidgrow.usercenter.service.*;
+import com.kidgrow.usercenter.vo.UserRegVo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.ObjectUtils;
@@ -58,22 +60,27 @@
@Resource
private ISysRoleUserService roleUserService;
-
+ @Resource
+ private ISysDictionariesService sysDictionariesService;
@Resource
private SysRoleMenuMapper roleMenuMapper;
@Autowired
private ISysOrganizationService organizationService;
@Autowired
+ private ISysHospitalService hospitalService;
+ @Autowired
+ private ISysDepartmentService departmentService;
+ @Autowired
private ISysUserOrgService iSysUserOrgService;
@Autowired
private RedisUtils redisUtils;
@Autowired
private SmsChuangLanService smsChuangLanService;
-
@Autowired
private DistributedLock lock;
-
+ @Autowired
+ private SysDoctorMapper sysDoctorMapper;
@Override
public LoginAppUser findByUsername(String username) {
@@ -93,10 +100,16 @@
return getLoginAppUser(sysUser);
}
+ /**
+ *
+ * 获取登录用户的一系列信息 hrj 06-04修改
+ * @param sysUser
+ * @return
+ */
@Override
public LoginAppUser getLoginAppUser(SysUser sysUser) {
+ LoginAppUser loginAppUser = new LoginAppUser();
if (sysUser != null) {
- LoginAppUser loginAppUser = new LoginAppUser();
BeanUtils.copyProperties(sysUser, loginAppUser);
//获取用户所属组织机构列表
List<SysOrganization> sysOrganizations = organizationService.findListByUserId(sysUser.getId());
@@ -116,10 +129,17 @@
loginAppUser.setPermissions(permissions);
}
}
-
- return loginAppUser;
+ //是否医院管理员
+ com.kidgrow.usercenter.model.SysDoctor sysDoctor=findDoctorByUserId(sysUser.getId());
+ if (sysDoctor.getIsAdminUser() != null) {
+ sysUser.setHAdminUser(sysDoctor.getIsAdminUser());
+ }
+ //医院信息 只有H端要返回的信息
+ if (sysUser.getTenantId() == CommonConstant.H_TENANT) {
+ sysUser.setDoctorUserAllVO(baseMapper.findDoctorUserAllData(sysUser.getId()));
+ }
}
- return null;
+ return loginAppUser;
}
@@ -195,21 +215,100 @@
@Transactional
@Override
- public ResultBody updatePassword(Long id, String oldPassword, String newPassword) {
+ public ResultBody updatePassword(Long id, String oldPassword, String newPassword,Boolean isdefault) {
SysUser sysUser = baseMapper.selectById(id);
if (StrUtil.isNotBlank(oldPassword)) {
if (!passwordEncoder.matches(oldPassword, sysUser.getPassword())) {
- return ResultBody.failed("旧密码错误");
+ return ResultBody.failed("旧密码错误！");
}
}
if (StrUtil.isBlank(newPassword)) {
- newPassword = CommonConstant.DEF_USER_PASSWORD;
+ newPassword =com.kidgrow.common.utils.RandomValueUtils.getRandom(6);
}
SysUser user = new SysUser();
user.setId(id);
user.setPassword(passwordEncoder.encode(newPassword));
+ if (isdefault) {
+ user.setDefaultAuth(true);
+ }
baseMapper.updateById(user);
- return ResultBody.ok().msg("修改成功");
+ if (isdefault){
+ return ResultBody.ok().msg("密码重置成功！").data(newPassword);
+ }
+ else{
+ return ResultBody.ok().msg("密码修改成功！").data(true);
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public ResultBody updateUserTel(Map<String, Object> params) {
+ Long id = MapUtils.getLong(params, "id");
+ String oldTel = MapUtils.getString(params, "oldTel");
+ String newTel = MapUtils.getString(params, "newTel");
+ String authCode = MapUtils.getString(params, "authCode");
+ String userPassword = MapUtils.getString(params, "userPassword");
+
+ if (id > 0 && StringUtils.isNotBlank(oldTel)&& StringUtils.isNotBlank(newTel) && StringUtils.isNotBlank(authCode) && StringUtils.isNotBlank(userPassword)) {
+ //检查验证码
+ Object hget = redisUtils.hget(ConstantSMS.PHONE_SMS, newTel);
+ if (hget != null) {
+ JSONObject redisJson = JSON.parseObject(JSON.toJSONString(hget));
+ Object verificationCodeObject = redisJson.get("verificationCode");
+ //核对验证码
+ if (authCode.equals(verificationCodeObject)) {
+ //验证旧手机号和密码
+ SysUser sysUser = baseMapper.selectById(id);
+ if (passwordEncoder.matches(userPassword, sysUser.getPassword()) && sysUser.getMobile().equals((oldTel))) {
+ Object date = redisJson.get("endTime");
+ long time = DateUtils.parseDate(date.toString()).getTime();
+ long timeNow = new Date().getTime();
+ if (timeNow <= time) {
+ //查询手机号是否已经存在
+ Map<String, Object> selectMap = new HashMap<>();
+ selectMap.put("mobile", newTel);
+ List<SysUser> sysUsersList = baseMapper.selectByMap(selectMap);
+ if (sysUsersList.size() > 0) {
+ return ResultBody.failed("该手机号已经存在!");
+ } else {
+ //验证通过，修改手机号
+ SysUser user = new SysUser();
+ user.setId(id);
+ user.setMobile(newTel);
+ user.setUsername(newTel);
+ //修改doctor表
+ com.kidgrow.usercenter.model.SysDoctor sysDoctorModel= findDoctorByUserId(user.getId());
+ com.kidgrow.usercenter.model.SysDoctor newsysDoctorModel= new com.kidgrow.usercenter.model.SysDoctor();
+ if (sysDoctorModel!=null) {
+ //理论上只有一个，如果有多个 只取第一个
+ newsysDoctorModel.setId(sysDoctorModel.getId());
+ newsysDoctorModel.setDoctorTel(newTel);
+ sysDoctorMapper.updateById(newsysDoctorModel);
+ }
+ if (baseMapper.updateById(user) > 0) {
+ //将Redis清除
+ redisUtils.hdel(ConstantSMS.PHONE_SMS,newTel);
+ return ResultBody.ok().msg("手机号修改成功！");
+ } else {
+ return ResultBody.failed("手机号修改失败！");
+ }
+ }
+ } else {
+ return ResultBody.failed("手机验证码已过期！");
+ }
+ } else {
+ return ResultBody.failed("用户信息验证失败，请提供正确的手机号和密码！");
+ }
+ } else {
+ return ResultBody.failed("手机验证码有误！");
+ }
+ } else {
+ //redis获取失败
+ return ResultBody.failed("请重新获取验证码！");
+ }
+ } else {
+ return ResultBody.failed("必须参数有误！");
+ }
}
@Override
@@ -260,7 +359,8 @@
if (StringUtils.isBlank(sysUser.getType())) {
sysUser.setType(UserType.BACKEND.name());
}
- sysUser.setPassword(passwordEncoder.encode(CommonConstant.DEF_USER_PASSWORD));
+ String defaultPassWord=com.kidgrow.common.utils.RandomValueUtils.getRandom(6);
+ sysUser.setPassword(passwordEncoder.encode(defaultPassWord));
sysUser.setEnabled(Boolean.TRUE);
}
String username = sysUser.getUsername();
@@ -413,12 +513,10 @@
if (phone == null || "".equals(phone.trim())) {
return ResultBody.failed("请输入手机号");
}
- Map<String, Object> selectMap = new HashMap<>();
- selectMap.put("mobile", phone);
- List<SysUser> sysUsers = baseMapper.selectByMap(selectMap);
- if(sysUsers.size()>0){
+ if (phoneIsUsed(phone)) {
return ResultBody.failed("该手机号已经注册");
}
+
Map<String, Object> mapDto=new HashMap();
mapDto.put("phone",phone);
mapDto.put("type",ConstantSMS.REGISTER_SMS);
@@ -439,6 +537,9 @@
String phone = MapUtils.getString(map, "phone");
if (StringUtils.isBlank(phone)) {
return ResultBody.failed("请输入新手机号");
+ }
+ if(!sysUser.getMobile().equals(password)){
+ return ResultBody.failed("请输入原手机号");
}
String verificationCode = MapUtils.getString(map, "verificationCode");
if (StringUtils.isBlank(verificationCode)) {
@@ -482,4 +583,226 @@
return ResultBody.failed("该手机号没有验证码");
}
}
+
+ @Override
+ public ResultBody findAppointUsers(Integer type) {
+ List<SysUser> list = baseMapper.findAppointUsers(type);
+ return ResultBody.ok().data(list);
+}
+
+ /**
+ * 根据userid获取用户其它信息
+ * @param userId
+ * @return
+ */
+ @Override
+ public ResultBody findDoctorUserAllData(Long userId) {
+ if (userId>0) {
+ return ResultBody.ok().data(baseMapper.findDoctorUserAllData(userId));
+ }
+ return ResultBody.ok().data(null);
+ }
+ /**
+ * H端用户注册 管理员添加用户
+ * @param userRegVo
+ * @return
+ */
+ @Override
+ public ResultBody doctorUserReg(UserRegVo userRegVo) {
+ //检查手机号是否已经注册 H端登录名和手机号存一样的值
+ if (phoneIsUsed(userRegVo.getMobile())) {
+ return ResultBody.failed("该手机号已经注册");
+ }
+ //检查判断是注册 还是添加用户，注册用户先走基本数据建设
+ if (userRegVo.getHospitalId()==null) {
+ userRegVo.setDoctorState(true);
+ //添加医院组织结构数据
+ List<SysOrganization> sysOrganizationList=new ArrayList<SysOrganization>();
+ SysOrganization sysOrganizationHos=new SysOrganization();
+ sysOrganizationHos.setOrgAttr(1);
+ sysOrganizationHos.setOrgLevel(1);
+ sysOrganizationHos.setOrgName(userRegVo.getHospitalName());
+ sysOrganizationList.add(sysOrganizationHos);
+
+ //添加科室组织数据
+ SysOrganization sysOrganizationDe=new SysOrganization();
+ sysOrganizationDe.setOrgAttr(2);
+ sysOrganizationDe.setOrgLevel(2);
+ sysOrganizationDe.setOrgName(userRegVo.getDepartmentName());
+ sysOrganizationList.add(sysOrganizationDe);
+ //批量写入
+ boolean orgRe= organizationService.saveBatch(sysOrganizationList);
+ if (orgRe) {
+ //写医院数据
+ SysHospital sysHospital=new SysHospital();
+ sysHospital.setHospitalName(userRegVo.getHospitalName());
+ sysHospital.setOrgId(sysOrganizationHos.getId());
+ sysHospital.setAccountsCount(1);
+ sysHospital.setHospitalState(0);
+ sysHospital.setCreateUserId(0L);
+ sysHospital.setCreateUserName("自主注册");
+
+ boolean h=hospitalService.save(sysHospital);
+ if (h) {
+ userRegVo.setHospitalId(sysHospital.getId());
+ //保存科室数据
+ SysDepartment sysDepartment=new SysDepartment();
+ sysDepartment.setHospitalId(sysHospital.getId());
+ sysDepartment.setOrgId(sysOrganizationDe.getId());
+ sysDepartment.setDepartmentName(userRegVo.getDepartmentName());
+ sysDepartment.setSaleUserId(0L);
+ sysDepartment.setSaleUserName("自主注册");
+ sysDepartment.setSaleUserTel("0");
+ sysDepartment.setServerUserId(0L);
+ sysDepartment.setServerUserTel("0");
+ boolean d=departmentService.save(sysDepartment);
+ if (!d) {
+ return ResultBody.failed("科室数据写入失败");
+ }
+ else
+ {
+ userRegVo.setDepartmentId(sysDepartment.getId());
+ }
+ }
+ else
+ {
+ return ResultBody.failed("医院数据写入失败");
+ }
+ }
+ else
+ {
+ return ResultBody.failed("组织数据写入失败");
+ }
+ }
+ //添加用户数据 如果没有输入密码，将会创建一个默认密码返回
+ String defaultPassWord="";
+ SysUser sysUser=new SysUser();
+ sysUser.setUsername(userRegVo.getUsername());
+ sysUser.setMobile(userRegVo.getMobile());
+ if (StringUtils.isBlank(userRegVo.getPassword())) {
+ defaultPassWord=com.kidgrow.common.utils.RandomValueUtils.getRandom(6);
+ sysUser.setPassword(passwordEncoder.encode(defaultPassWord));
+ sysUser.setDefaultAuth(true);
+ userRegVo.setPassword(defaultPassWord);
+ }
+ else {
+ sysUser.setPassword(passwordEncoder.encode(userRegVo.getPassword()));
+ sysUser.setDefaultAuth(false);
+ }
+ sysUser.setNickname(userRegVo.getNickname());
+ sysUser.setSex(userRegVo.getSex());
+ sysUser.setEnabled(true);
+ if (StringUtils.isNotBlank(userRegVo.getType())) {
+ sysUser.setType(userRegVo.getType());
+ }
+ else
+ {
+ sysUser.setType(UserType.DOCTOR.name());
+ }
+ sysUser.setHAdminUser(false);
+ sysUser.setOpenId(userRegVo.getOpenId());
+ sysUser.setDel(false);
+ sysUser.setTenantId("hospital");
+ boolean u=this.save(sysUser);
+ if(u)
+ {
+ //写入职务数据
+ if (StringUtils.isNotBlank(userRegVo.getDoctorRank())) {
+ //检查医生职务是否存在
+ Map<String, Object> selectMap = new HashMap<>();
+ selectMap.put("dictionaries_name", userRegVo.getDoctorRank());
+ List<SysDictionaries> dictionariesList=sysDictionariesService.findAll(selectMap);
+ if (dictionariesList.size()>0) {
+ for (int i = dictionariesList.size() - 1; i >= 0; i--) {
+ if (dictionariesList.get(i).getDictionariesName().equals(userRegVo.getDoctorRank())) {
+ userRegVo.setDoctorRankId(dictionariesList.get(i).getId());
+ break;
+ }
+ }
+ }
+ else
+ {
+ //创建字典数据
+ SysDictionaries sysDictionaries=new SysDictionaries();
+ sysDictionaries.setDictionariesKey(DictionariesConstants.DOCTOR_RANK);
+ sysDictionaries.setDictionariesClassId(DictionariesConstants.DOCTOR_RANK_ID.toString());
+ //将名称汉字转为拼音
+ sysDictionaries.setDictionariesKey("temp");
+ sysDictionaries.setDictionariesName(userRegVo.getDoctorRank());
+ sysDictionaries.setCreateUserId(0L);
+ sysDictionaries.setCreateUserName("自动创建");
+ boolean d=sysDictionariesService.save(sysDictionaries);
+ if (d) {
+ userRegVo.setDoctorRankId(sysDictionaries.getId());
+ }
+ }
+ }
+ //写入医生数据
+ SysDoctor sysDoctor=new SysDoctor();
+ sysDoctor.setUserId(sysUser.getId());
+ sysDoctor.setHospitalId(userRegVo.getHospitalId());
+ sysDoctor.setHospitalName(userRegVo.getHospitalName());
+ sysDoctor.setDepartmentId(userRegVo.getDepartmentId());
+ sysDoctor.setDepartmentName(userRegVo.getDepartmentName());
+ sysDoctor.setDoctorRank(userRegVo.getDoctorRank());
+ sysDoctor.setDoctorRankId(userRegVo.getDoctorRankId());
+ sysDoctor.setCreateUserId(0L);
+ sysDoctor.setCreateUserName("自主注册");
+ sysDoctor.setDoctorState(userRegVo.getDoctorState());
+ sysDoctor.setDoctorTel(userRegVo.getMobile());
+ sysDoctor.setDoctorName(userRegVo.getNickname());
+ sysDoctor.setServerUserId(0L);
+ sysDoctor.setServerUserName("自主注册");
+ if (sysDoctorMapper.insert(sysDoctor)==1) {
+ sysUser.setPassword(userRegVo.getPassword());
+ return ResultBody.ok(200,"注册成功").data(sysUser);
+ }
+ else
+ {
+ return ResultBody.failed("医生数据写入失败");
+ }
+ }
+ else
+ {
+ return ResultBody.failed("用户数据写入失败");
+ }
+ }
+
+ /**
+ * 检查手机号是否已经注册 true存在 false不存在
+ * @param phone
+ * @return
+ */
+ private boolean phoneIsUsed(String phone)
+ {
+ Map<String, Object> selectMap = new HashMap<>();
+ selectMap.put("mobile", phone);
+ List<SysUser> sysUsers = baseMapper.selectByMap(selectMap);
+ return (sysUsers.size()>0);
+ }
+ /**
+ * 检查用户登录名是否已经注册 true存在 false不存在
+ * @param userName
+ * @return
+ */
+ private boolean userNameIsUsed(String userName)
+ {
+ Map<String, Object> selectMap = new HashMap<>();
+ selectMap.put("username", userName);
+ List<SysUser> sysUsers = baseMapper.selectByMap(selectMap);
+ return (sysUsers.size()>0);
+ }
+ public com.kidgrow.usercenter.model.SysDoctor findDoctorByUserId(Long userId)
+ {
+ Map<String, Object> doctorMap = new HashMap<>();
+ doctorMap.put("user_id",userId);
+ doctorMap.put("enabled",1);
+ doctorMap.put("is_del",0);
+ List<com.kidgrow.usercenter.model.SysDoctor> sysDoctorList=sysDoctorMapper.selectByMap(doctorMap);
+ if (sysDoctorList.size()>0) {
+ return sysDoctorList.get(0);
+ }
+ return new com.kidgrow.usercenter.model.SysDoctor();
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0