From 3053f3c6a8ea26d204e83e9f17a418d6928da5bc Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Tue, 16 Jun 2020 19:19:11 +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 | 114 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 76 insertions(+), 38 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 b8e048b..ff57dbc 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
@@ -16,6 +16,7 @@
import com.kidgrow.common.model.*;
import com.kidgrow.common.service.impl.SuperServiceImpl;
import com.kidgrow.common.utils.DateUtils;
+import com.kidgrow.common.utils.Pinyin4jUtil;
import com.kidgrow.redis.util.RedisUtils;
import com.kidgrow.sms.feign.SmsChuangLanService;
import com.kidgrow.sms.model.ConstantSMS;
@@ -23,6 +24,7 @@
import com.kidgrow.usercenter.model.SysDoctor;
import com.kidgrow.usercenter.model.*;
import com.kidgrow.usercenter.service.*;
+import com.kidgrow.usercenter.vo.HospitalDoctorListVo;
import com.kidgrow.usercenter.vo.UserRegVo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.MapUtils;
@@ -106,8 +108,8 @@
}
/**
- *
* 获取登录用户的一系列信息 hrj 06-04修改
+ *
* @param sysUser
* @return
*/
@@ -135,7 +137,7 @@
}
}
//是否医院管理员
- com.kidgrow.usercenter.model.SysDoctor sysDoctor=findDoctorByUserId(sysUser.getId());
+ com.kidgrow.usercenter.model.SysDoctor sysDoctor = findDoctorByUserId(sysUser.getId());
if (sysDoctor.getIsAdminUser() != null) {
sysUser.setHAdminUser(sysDoctor.getIsAdminUser());
}
@@ -220,7 +222,7 @@
@Transactional
@Override
- public ResultBody updatePassword(Long id, String oldPassword, String newPassword,Boolean isdefault) {
+ 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())) {
@@ -228,7 +230,7 @@
}
}
if (StrUtil.isBlank(newPassword)) {
- newPassword =com.kidgrow.common.utils.RandomValueUtils.getRandom(6);
+ newPassword = com.kidgrow.common.utils.RandomValueUtils.getRandom(6);
}
SysUser user = new SysUser();
user.setId(id);
@@ -237,10 +239,9 @@
user.setDefaultAuth(true);
}
baseMapper.updateById(user);
- if (isdefault){
+ if (isdefault) {
return ResultBody.ok().msg("密码重置成功！").data(newPassword);
- }
- else{
+ } else {
return ResultBody.ok().msg("密码修改成功！").data(true);
}
}
@@ -254,7 +255,7 @@
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)) {
+ 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) {
@@ -282,9 +283,9 @@
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) {
+ 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);
@@ -292,7 +293,7 @@
}
if (baseMapper.updateById(user) > 0) {
//将Redis清除
- redisUtils.hdel(ConstantSMS.PHONE_SMS,newTel);
+ redisUtils.hdel(ConstantSMS.PHONE_SMS, newTel);
return ResultBody.ok().msg("手机号修改成功！");
} else {
return ResultBody.failed("手机号修改失败！");
@@ -364,7 +365,7 @@
if (StringUtils.isBlank(sysUser.getType())) {
sysUser.setType(UserType.BACKEND.name());
}
- String defaultPassWord=com.kidgrow.common.utils.RandomValueUtils.getRandom(6);
+ String defaultPassWord = com.kidgrow.common.utils.RandomValueUtils.getRandom(6);
sysUser.setPassword(passwordEncoder.encode(defaultPassWord));
sysUser.setEnabled(Boolean.TRUE);
}
@@ -386,10 +387,24 @@
return result ? ResultBody.ok().data(sysUser).msg("操作成功") : ResultBody.failed("操作失败");
}
+ /**
+ * 删除用户
+ *
+ * @param id
+ * @return
+ */
@Transactional(rollbackFor = Exception.class)
@Override
public boolean delUser(Long id) {
+ //删除角色数据
roleUserService.deleteUserRole(id, null);
+ //删除组织对应数据
+ organizationService.deleteByUserId(id);
+ //删除医生数据
+ Map<String, Object> params = new HashMap<>();
+ params.put("userId", id);
+ sysDoctorMapper.deleteByMap(params);
+ //删除用户数据
return baseMapper.deleteById(id) > 0;
}
@@ -452,6 +467,7 @@
/**
* 通过手机号 修改密码
+ *
* @param map
* @return
*/
@@ -508,6 +524,7 @@
/**
* 通过手机号 注册验证
+ *
* @param map
* @return
*/
@@ -522,19 +539,20 @@
return ResultBody.failed("该手机号已经注册");
}
- Map<String, Object> mapDto=new HashMap();
- mapDto.put("phone",phone);
- mapDto.put("type",ConstantSMS.REGISTER_SMS);
+ Map<String, Object> mapDto = new HashMap();
+ mapDto.put("phone", phone);
+ mapDto.put("type", ConstantSMS.REGISTER_SMS);
return smsChuangLanService.sendVerificationCode(mapDto);
}
/**
* 通过手机号修改 手机号
+ *
* @param map
* @return
*/
@Override
- public ResultBody updatePhone(Map<String, Object> map,SysUser sysUser) {
+ public ResultBody updatePhone(Map<String, Object> map, SysUser sysUser) {
String password = MapUtils.getString(map, "password");
if (StringUtils.isBlank(password)) {
return ResultBody.failed("请输入密码");
@@ -543,14 +561,14 @@
if (StringUtils.isBlank(phone)) {
return ResultBody.failed("请输入新手机号");
}
- if(!sysUser.getMobile().equals(password)){
+ if (!sysUser.getMobile().equals(password)) {
return ResultBody.failed("请输入原手机号");
}
String verificationCode = MapUtils.getString(map, "verificationCode");
if (StringUtils.isBlank(verificationCode)) {
return ResultBody.failed("请输入验证码");
}
- if (!passwordEncoder.matches(sysUser.getPassword(),password)) {
+ if (!passwordEncoder.matches(sysUser.getPassword(), password)) {
return ResultBody.failed("密码错误");
}
Object hget = redisUtils.hget(ConstantSMS.PHONE_SMS, map.get("phone").toString());
@@ -591,22 +609,24 @@
@Override
public ResultBody findAppointUsers(Integer type) {
- List<SysUser> list = baseMapper.findAppointUsers(type);
- return ResultBody.ok().data(list);
-}
+ List<SysUser> list = baseMapper.findAppointUsers(type);
+ return ResultBody.ok().data(list);
+ }
/**
* 根据userid获取用户其它信息
+ *
* @param userId
* @return
*/
@Override
public ResultBody findDoctorUserAllData(Long userId) {
- if (userId>0) {
+ if (userId > 0) {
return ResultBody.ok().data(baseMapper.findDoctorUserAllData(userId));
}
return ResultBody.ok().data(null);
}
+
/**
* H端用户注册 管理员添加用户
* @param userRegVo
@@ -751,7 +771,8 @@
sysDictionaries.setDictionariesKey(DictionariesConstants.DOCTOR_RANK);
sysDictionaries.setDictionariesClassId(DictionariesConstants.DOCTOR_RANK_ID.toString());
//将名称汉字转为拼音
- sysDictionaries.setDictionariesKey("temp");
+
+ sysDictionaries.setDictionariesKey(Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(userRegVo.getDoctorRank(),true)));
sysDictionaries.setDictionariesName(userRegVo.getDoctorRank());
sysDictionaries.setCreateUserId(0L);
sysDictionaries.setCreateUserName("自动创建");
@@ -792,42 +813,59 @@
return ResultBody.failed("用户数据写入失败");
}
}
+ /**
+ * 获取医院科室下的所有有效的医生
+ * @param hospitalId
+ * @param departmentId
+ * @return
+ */
+ @Override
+ public ResultBody hospitalDoctorList(Long hospitalId, Long departmentId) {
+ if (hospitalId>0&&departmentId>0) {
+ List<HospitalDoctorListVo> listVoList=baseMapper.hospitalDoctorList(hospitalId,departmentId);
+ return ResultBody.ok().data(listVoList);
+ }
+ else
+ {
+ return ResultBody.failed("医院数据有误");
+ }
+ }
/**
* 检查手机号是否已经注册 true存在 false不存在
+ *
* @param phone
* @return
*/
- private boolean phoneIsUsed(String phone)
- {
+ 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);
+ return (sysUsers.size() > 0);
}
+
/**
* 检查用户登录名是否已经注册 true存在 false不存在
+ *
* @param userName
* @return
*/
- private boolean userNameIsUsed(String userName)
- {
+ 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);
+ return (sysUsers.size() > 0);
}
- public com.kidgrow.usercenter.model.SysDoctor findDoctorByUserId(Long userId)
- {
+
+ 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) {
+ 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