From 6557baac627dce769c2b05ab482e4daf262a88ac Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 17 Jun 2020 17:34:01 +0800
Subject: [PATCH] 1.增加工具类 MultipartFileUtils ,支持将MultipartFile类型转换为file类型 2.增加缩略图相关全局配置变量：宽高和生成缩略图的暂存目录（缩略图上传成功后会删除） 3.修改文件上传中心的上传代码，将生成目录和aliyun上传方法抽离独立 4.增加医院logo上传支持接口（可返回缩略图地址） 5.修改登录后回去用户信息不完整bug
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 346 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 305 insertions(+), 41 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 7cf298c..4b67902 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
@@ -6,21 +6,26 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.common.utils.Pinyin4jUtil;
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.mapper.*;
+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;
import org.apache.commons.lang3.ObjectUtils;
@@ -55,12 +60,17 @@
@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
@@ -71,6 +81,13 @@
private DistributedLock lock;
@Autowired
private SysDoctorMapper sysDoctorMapper;
+
+ @Autowired
+ private SysRoleMapper sysRoleMapper;
+ @Autowired
+ private SysUserRoleMapper sysUserRoleMapper;
+
+ private final String HOSPITAL_ADMIN="hospital_admin";
@Override
public LoginAppUser findByUsername(String username) {
@@ -91,8 +108,8 @@
}
/**
- *
* 获取登录用户的一系列信息 hrj 06-04修改
+ *
* @param sysUser
* @return
*/
@@ -120,13 +137,14 @@
}
}
//是否医院管理员
- 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());
+ loginAppUser.setHAdminUser(sysDoctor.getIsAdminUser());
}
//医院信息 只有H端要返回的信息
- if (sysUser.getTenantId() == CommonConstant.H_TENANT) {
- sysUser.setDoctorUserAllVO(baseMapper.findDoctorUserAllData(sysUser.getId()));
+ if (sysUser.getTenantId().toLowerCase().equals(CommonConstant.H_TENANT.toLowerCase())) {
+ DoctorUserAll doctorUserAllVo=baseMapper.findDoctorUserAllData(sysUser.getId());
+ loginAppUser.setDoctorUserAllVO(doctorUserAllVo);
}
}
return loginAppUser;
@@ -205,7 +223,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())) {
@@ -213,7 +231,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);
@@ -222,10 +240,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);
}
}
@@ -239,7 +256,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) {
@@ -267,9 +284,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);
@@ -277,7 +294,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("手机号修改失败！");
@@ -349,7 +366,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();
@@ -370,10 +388,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;
}
@@ -436,6 +468,7 @@
/**
* 通过手机号 修改密码
+ *
* @param map
* @return
*/
@@ -492,6 +525,7 @@
/**
* 通过手机号 注册验证
+ *
* @param map
* @return
*/
@@ -502,25 +536,24 @@
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);
+
+ 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("请输入密码");
@@ -529,14 +562,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());
@@ -577,30 +610,261 @@
@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
+ * @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());
+ sysOrganizationHos.setCreateUserName("自主注册");
+ sysOrganizationHos.setCreateUserId(0L);
+ sysOrganizationList.add(sysOrganizationHos);
+
+ //添加科室组织数据
+ SysOrganization sysOrganizationDe=new SysOrganization();
+ sysOrganizationDe.setOrgAttr(2);
+ sysOrganizationDe.setOrgLevel(2);
+ sysOrganizationDe.setOrgName(userRegVo.getDepartmentName());
+ sysOrganizationDe.setCreateUserName("自主注册");
+ sysOrganizationDe.setCreateUserId(0L);
+ 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");
+ sysDepartment.setServerUserName("自主注册");
+ 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)
+ {
+ //保存 角色信息
+ Map<String,Object> map= new HashMap<>();
+ map.put("code",HOSPITAL_ADMIN);
+ map.put("enabled",1);
+ map.put("is_del",0);
+ List<SysRole> sysRoles = sysRoleMapper.selectByMap(map);
+ if(sysRoles.size()>0){
+ //保存一个角色
+ SysRole sysRole = sysRoles.get(0);
+ SysRoleUser sysRoleUser=new SysRoleUser();
+ sysRoleUser.setRoleId(sysRole.getId());
+ sysRoleUser.setUserId(sysUser.getId());
+ int insert = sysUserRoleMapper.insert(sysRoleUser);
+ }
+ //写入职务数据
+ 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(Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(userRegVo.getDoctorRank(),true)));
+ 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().data(sysUser);
+// return ResultBody.ok(200,"注册成功").data(sysUser);
+ }
+ else
+ {
+ return ResultBody.failed("医生数据写入失败");
+ }
+ }
+ else
+ {
+ 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) {
+ 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) {
+ 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();
--
Gitblit v1.8.0