From db7bf1e9d1da402f22f26164237edcfad5d5c7d2 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Thu, 13 Aug 2020 21:37:27 +0800
Subject: [PATCH] 修改优化登录后获取用户基本信息接口,解决获取医生信息冗余查询的问题
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 703 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 467 insertions(+), 236 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 45c4f31..cffd3c6 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
@@ -15,16 +15,17 @@
import com.kidgrow.common.model.SysUser;
import com.kidgrow.common.model.*;
import com.kidgrow.common.service.impl.SuperServiceImpl;
+import com.kidgrow.common.utils.AesUtils;
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.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;
@@ -82,6 +83,13 @@
@Autowired
private SysDoctorMapper sysDoctorMapper;
+ @Autowired
+ private SysRoleMapper sysRoleMapper;
+ @Autowired
+ private SysUserRoleMapper sysUserRoleMapper;
+ @Autowired
+ private SysOrganizationMapper sysOrganizationMapper;
+
@Override
public LoginAppUser findByUsername(String username) {
SysUser sysUser = this.selectByUsername(username);
@@ -101,20 +109,24 @@
}
/**
- *
* 获取登录用户的一系列信息 hrj 06-04修改
- * @param sysUser
+ *
+ * @param sysUserNew
* @return
*/
@Override
- public LoginAppUser getLoginAppUser(SysUser sysUser) {
+ public LoginAppUser getLoginAppUser(SysUser sysUserNew) {
LoginAppUser loginAppUser = new LoginAppUser();
+ SysUser sysUser = this.baseMapper.selectById(sysUserNew);
if (sysUser != null) {
BeanUtils.copyProperties(sysUser, loginAppUser);
//获取用户所属组织机构列表
+ loginAppUser.setDefaultAuth(sysUser.getDefaultAuth());
List<SysOrganization> sysOrganizations = organizationService.findListByUserId(sysUser.getId());
//设置组织机构集合
- loginAppUser.setOrganizations(sysOrganizations);
+ if (sysOrganizations != null) {
+ loginAppUser.setOrganizations(sysOrganizations);
+ }
List<SysRole> sysRoles = roleUserService.findRolesByUserId(sysUser.getId());
// 设置角色
loginAppUser.setRoles(sysRoles);
@@ -129,15 +141,17 @@
loginAppUser.setPermissions(permissions);
}
}
- //是否医院管理员
- 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()));
+ if (sysUser.getTenantId().toLowerCase().equals(CommonConstant.H_TENANT.toLowerCase())) {
+ DoctorUserAll doctorUserAllVo = baseMapper.findDoctorUserAllData(sysUser.getId());
+ loginAppUser.setDoctorUserAllVO(doctorUserAllVo);
+ //是否医院管理员
+ loginAppUser.setHAdminUser(doctorUserAllVo.getIsAdminUser());
}
+ //返回的数据为什么要把密码也返回？清空!!
+ loginAppUser.setPassword("");
+ loginAppUser.setNewPassword("");
+ loginAppUser.setOldPassword("");
}
return loginAppUser;
}
@@ -153,7 +167,8 @@
public SysUser selectByUsername(String username) {
String clientId = ClientContextHolder.getClient();
List<SysUser> users = baseMapper.selectList(
- new QueryWrapper<SysUser>().eq("username", username).eq("tenant_id", clientId)
+ //new QueryWrapper<SysUser>().eq("username", username).eq("tenant_id", clientId)
+ new QueryWrapper<SysUser>().eq("username", username)
);
return getUser(users);
}
@@ -213,96 +228,88 @@
}
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@Override
- public ResultBody updatePassword(Long id, String oldPassword, String newPassword,Boolean isdefault) {
+ public ResultBody updatePassword(Long id, String oldPassword, String newPassword, Boolean isdefault) throws Exception {
+
SysUser sysUser = baseMapper.selectById(id);
if (StrUtil.isNotBlank(oldPassword)) {
+ oldPassword = AesUtils.desEncrypt(oldPassword).trim();
if (!passwordEncoder.matches(oldPassword, sysUser.getPassword())) {
return ResultBody.failed("旧密码错误！");
}
}
if (StrUtil.isBlank(newPassword)) {
- newPassword =com.kidgrow.common.utils.RandomValueUtils.getRandom(6);
+ newPassword = com.kidgrow.common.utils.RandomValueUtils.getRandom(6);
+ } else {
+ newPassword = AesUtils.desEncrypt(newPassword).trim();
}
SysUser user = new SysUser();
user.setId(id);
user.setPassword(passwordEncoder.encode(newPassword));
if (isdefault) {
user.setDefaultAuth(true);
+ } else {
+ user.setDefaultAuth(false);
}
baseMapper.updateById(user);
- if (isdefault){
+ if (isdefault) {
return ResultBody.ok().msg("密码重置成功！").data(newPassword);
- }
- else{
+ } else {
return ResultBody.ok().msg("密码修改成功！").data(true);
}
}
@Override
@Transactional(rollbackFor = Exception.class)
- public ResultBody updateUserTel(Map<String, Object> params) {
+ public ResultBody updateUserTel(Map<String, Object> params) throws Exception {
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");
+ String newTel = AesUtils.desEncrypt(MapUtils.getString(params, "newTel")).trim();
+ String authCode = AesUtils.desEncrypt(MapUtils.getString(params, "authCode")).trim();
+ String userPassword = AesUtils.desEncrypt(MapUtils.getString(params, "userPassword")).trim();
- 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) {
- JSONObject redisJson = JSON.parseObject(JSON.toJSONString(hget));
- Object verificationCodeObject = redisJson.get("verificationCode");
- //核对验证码
- if (authCode.equals(verificationCodeObject)) {
+ if (CheckVerificationCode(ConstantSMS.PHONE_SMS, newTel, authCode)) {
+ //查询手机号是否已经存在
+ 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 sysUser = baseMapper.selectById(id);
+ userPassword = AesUtils.desEncrypt(userPassword);
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);
- //修改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) {
- return ResultBody.ok().msg("手机号修改成功！");
- } else {
- return ResultBody.failed("手机号修改失败！");
- }
- }
+ //验证通过，修改手机号
+ 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("手机验证码已过期！");
+ return ResultBody.failed("手机号修改失败！");
}
} else {
return ResultBody.failed("用户信息验证失败，请提供正确的手机号和密码！");
}
- } else {
- return ResultBody.failed("手机验证码有误！");
}
} else {
- //redis获取失败
- return ResultBody.failed("请重新获取验证码！");
+ return ResultBody.failed("无效的验证码");
}
} else {
return ResultBody.failed("必须参数有误！");
@@ -353,11 +360,11 @@
@Transactional(rollbackFor = Exception.class)
@Override
public ResultBody saveOrUpdateUser(SysUser sysUser) {
+ String defaultPassWord = com.kidgrow.common.utils.RandomValueUtils.getRandom(6);
if (sysUser.getId() == null) {
if (StringUtils.isBlank(sysUser.getType())) {
sysUser.setType(UserType.BACKEND.name());
}
- String defaultPassWord=com.kidgrow.common.utils.RandomValueUtils.getRandom(6);
sysUser.setPassword(passwordEncoder.encode(defaultPassWord));
sysUser.setEnabled(Boolean.TRUE);
}
@@ -376,13 +383,28 @@
roleUserService.saveBatch(roleUsers);
}
}
+ sysUser.setPassword(defaultPassWord);
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;
}
@@ -444,12 +466,41 @@
}
/**
+ * 验证手机验证码
+ *
+ * @param constantSMS
+ * @param phone
+ * @param inputCode
+ * @return
+ */
+ public boolean CheckVerificationCode(String constantSMS, String phone, String inputCode) {
+ //获取缓存中的验证码对象
+ Object hget = redisUtils.hget(constantSMS, phone);
+ if (hget != null) {
+ //序列化验证码
+ JSONObject redisJson = JSON.parseObject(JSON.toJSONString(hget));
+ //拿取验证码
+ String verificationCodeObject = redisJson.get("verificationCode").toString();
+ //核对验证码
+ if (inputCode.equals(verificationCodeObject)) {
+ Object date = redisJson.get("endTime");
+ long time = DateUtils.parseDate(date.toString()).getTime();
+ Date dateNow = new Date();
+ long timeNow = dateNow.getTime();
+ return (timeNow <= time);
+ }
+ }
+ return false;
+ }
+
+ /**
* 通过手机号 修改密码
+ *
* @param map
* @return
*/
@Override
- public ResultBody passwordByPhone(Map<String, Object> map) {
+ public ResultBody passwordByPhone(Map<String, Object> map) throws Exception {
//手机号，type，验证码，新密码
String phone = MapUtils.getString(map, "phone");
if (phone == null || "".equals(phone.trim())) {
@@ -463,44 +514,33 @@
if (newPass == null || "".equals(newPass.trim())) {
return ResultBody.failed("请输入正确的密码");
}
- Object hget = redisUtils.hget(ConstantSMS.PASSWORD_SMS, map.get("phone").toString());
- if (hget != null) {
- JSONObject redisJson = JSON.parseObject(JSON.toJSONString(hget));
- Object verificationCodeObject = redisJson.get("verificationCode");
- if (verificationCode.equals(verificationCodeObject)) {
- Object date = redisJson.get("endTime");
- long time = DateUtils.parseDate(date.toString()).getTime();
- Date dateNow = new Date();
- long timeNow = dateNow.getTime();
- if (timeNow <= time) {
- //查询表
- Map<String, Object> selectMap = new HashMap<>();
- selectMap.put("mobile", phone);
- List<SysUser> sysUsers = baseMapper.selectByMap(selectMap);
- if (sysUsers.size() > 0) {
- SysUser user = new SysUser();
- user.setId(sysUsers.get(0).getId());
- user.setPassword(passwordEncoder.encode(newPass));
- baseMapper.updateById(user);
- //将Redis 清除
- redisUtils.hdel(ConstantSMS.PASSWORD_SMS, phone);
- return ResultBody.ok();
- } else {
- return ResultBody.failed("暂无该手机号信息");
- }
- } else {
- return ResultBody.failed("验证码超时");
- }
+ phone = AesUtils.desEncrypt(phone.trim());
+ verificationCode = AesUtils.desEncrypt(verificationCode.trim());
+ newPass = AesUtils.desEncrypt(newPass.trim());
+ if (CheckVerificationCode(ConstantSMS.PASSWORD_SMS, phone, verificationCode)) {
+ //查询表
+ Map<String, Object> selectMap = new HashMap<>();
+ selectMap.put("mobile", phone);
+ List<SysUser> sysUsers = baseMapper.selectByMap(selectMap);
+ if (sysUsers.size() > 0) {
+ SysUser user = new SysUser();
+ user.setId(sysUsers.get(0).getId());
+ user.setPassword(passwordEncoder.encode(newPass));
+ baseMapper.updateById(user);
+ //将Redis 清除
+ redisUtils.hdel(ConstantSMS.PASSWORD_SMS, phone);
+ return ResultBody.ok();
} else {
- return ResultBody.failed("验证码错误");
+ return ResultBody.failed("暂无该手机号信息");
}
} else {
- return ResultBody.failed("该手机号没有验证码");
+ return ResultBody.failed("无效的验证码");
}
}
/**
* 通过手机号 注册验证
+ *
* @param map
* @return
*/
@@ -515,19 +555,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("请输入密码");
@@ -536,11 +577,14 @@
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)) {
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());
@@ -581,222 +625,409 @@
@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
*/
+ @Transactional(rollbackFor = Exception.class)
@Override
- public ResultBody doctorUserReg(UserRegVo userRegVo) {
+ public ResultBody doctorUserReg(UserRegVo userRegVo, SysUser sysUserd) throws Exception {
+ if (sysUserd.getId() == null) {
+ sysUserd = this.baseMapper.selectById(userRegVo.getUserId());
+ }
+ userRegVo.setPassword(AesUtils.desEncrypt(userRegVo.getPassword()).trim());
+ userRegVo.setUsername(AesUtils.desEncrypt(userRegVo.getUsername()).trim());
//检查手机号是否已经注册 H端登录名和手机号存一样的值
if (phoneIsUsed(userRegVo.getMobile())) {
return ResultBody.failed("该手机号已经注册");
}
- //检查判断是注册 还是添加用户，注册用户先走基本数据建设
- if (StringUtils.isBlank(userRegVo.getHospitalId().toString())) {
- 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) {
+ //创建人id
+ Long createUserId = CommonConstant.CREATE_USER_ID;
+ //创建人名称
+ String createUserName = CommonConstant.CREATE_USER_NAME;
+ //是否注册用户
+ Boolean isReg = false;
+ //业务成功
+ Boolean isSuccess = true;
+ //业务失败提示信息
+ String expMsg = "";
+ //系统内置的注册医院和科室的组织数据
+ Long organizationHos = CommonConstant.HOSPITAL_ORG_ID;
+ Long organizationDep = CommonConstant.DEPARTMENT_ORG_ID;
+ //检查判断是注册 还是添加用户，注册用户先走基本数据建设 医院/科室
+ SysUserOrg sysUserOrgH = new SysUserOrg();
+ SysUserOrg sysUserOrgD = new SysUserOrg();
+ SysDictionaries sysDictionaries = new SysDictionaries();
+ SysDoctor sysDoctor = new SysDoctor();
+ if (userRegVo.getHospitalId() == null) {
+ isReg = true;
+ if (CheckVerificationCode(ConstantSMS.REGISTER_SMS, userRegVo.getMobile(), userRegVo.getVerification())) {
+ userRegVo.setDoctorState(true);
//写医院数据
- SysHospital sysHospital=new SysHospital();
+ SysHospital sysHospital = new SysHospital();
sysHospital.setHospitalName(userRegVo.getHospitalName());
- sysHospital.setOrgId(sysOrganizationHos.getId());
- sysHospital.setAccountsCount(1);
+ sysHospital.setOrgId(organizationHos);
+ //注册的用户所在医院默认是试用状态
sysHospital.setHospitalState(0);
- sysHospital.setCreateUserId(0L);
- sysHospital.setCreateUserName("自主注册");
+ sysHospital.setCreateUserId(createUserId);
+ sysHospital.setCreateUserName(createUserName);
- boolean h=hospitalService.save(sysHospital);
+ boolean h = hospitalService.save(sysHospital);
if (h) {
userRegVo.setHospitalId(sysHospital.getId());
//保存科室数据
- SysDepartment sysDepartment=new SysDepartment();
- sysDepartment.setHospitalId(sysHospital.getId());
- sysDepartment.setOrgId(sysOrganizationDe.getId());
+ SysDepartment sysDepartment = new SysDepartment();
+ sysDepartment.setOrgId(organizationDep);
sysDepartment.setDepartmentName(userRegVo.getDepartmentName());
- sysDepartment.setSaleUserId(0L);
- sysDepartment.setSaleUserName("自主注册");
+ sysDepartment.setSaleUserId(createUserId);
+ sysDepartment.setAccountsCount(1);
+ sysDepartment.setSaleUserName(createUserName);
sysDepartment.setSaleUserTel("0");
- sysDepartment.setServerUserId(0L);
+ sysDepartment.setServerUserId(createUserId);
sysDepartment.setServerUserTel("0");
- boolean d=departmentService.save(sysDepartment);
+ sysDepartment.setServerUserName(createUserName);
+ boolean d = departmentService.save(sysDepartment);
if (!d) {
- return ResultBody.failed("科室数据写入失败");
- }
- else
- {
+ isSuccess = false;
+ expMsg = "科室数据写入失败";
+ } else {
userRegVo.setDepartmentId(sysDepartment.getId());
}
+ } else {
+ isSuccess = false;
+ expMsg = "医院数据写入失败";
}
- else
- {
- return ResultBody.failed("医院数据写入失败");
- }
+ } else {
+ return ResultBody.failed("无效的验证码");
}
- else
- {
- return ResultBody.failed("组织数据写入失败");
- }
+ }
+
+ //业务执行中途出错
+ if (isReg && !isSuccess) {
+ return ResultBody.failed(expMsg);
+ }
+ if (!isReg && departmetAccountsCount(userRegVo.getDepartmentId()) < 1) {
+ return ResultBody.failed("当前科室可创建账户数量已满");
}
//添加用户数据 如果没有输入密码，将会创建一个默认密码返回
- String defaultPassWord="";
- SysUser sysUser=new SysUser();
- sysUser.setUsername(userRegVo.getUsername());
+ String defaultPassWord = "";
+ SysUser sysUser = new SysUser();
+ sysUser.setUsername(userRegVo.getMobile());
sysUser.setMobile(userRegVo.getMobile());
if (StringUtils.isBlank(userRegVo.getPassword())) {
- defaultPassWord=com.kidgrow.common.utils.RandomValueUtils.getRandom(6);
+ defaultPassWord = com.kidgrow.common.utils.RandomValueUtils.getRandom(6);
sysUser.setPassword(passwordEncoder.encode(defaultPassWord));
- sysUser.setDefaultAuth(true);
userRegVo.setPassword(defaultPassWord);
- }
- else {
+ } 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
- {
+ } else {
sysUser.setType(UserType.DOCTOR.name());
}
sysUser.setHAdminUser(false);
+ sysUser.setDefaultAuth(false);
sysUser.setOpenId(userRegVo.getOpenId());
sysUser.setDel(false);
- 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;
+ sysUser.setTenantId(CommonConstant.H_TENANT);
+ boolean u = this.save(sysUser);
+ SysRoleUser sysRoleUser = new SysRoleUser();
+ if (u) {
+ //保存角色用户绑定信息 sys_role_user
+ Map<String, Object> map = new HashMap<>();
+ map.put("code", CommonConstant.HOSPITAL_DOCTOR_CODE);
+ 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.setRoleId(sysRole.getId());
+ sysRoleUser.setUserId(sysUser.getId());
+ int insert = sysUserRoleMapper.insert(sysRoleUser);
+ if (insert > 0) {
+ //写入职务数据
+ if (StringUtils.isNotBlank(userRegVo.getDoctorRank())) {
+ //检查医生职务是否存在
+ Map<String, Object> selectMap = new HashMap<>();
+ selectMap.put("dictionariesName", userRegVo.getDoctorRank());
+ List<SysDictionaries> dictionariesList = sysDictionariesService.findAll(selectMap);
+ boolean dicBool = false;
+ 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());
+ dicBool = true;
+ break;
+ }
+ }
+ } else {
+ //创建字典数据
+ sysDictionaries.setDictionariesClassId(DictionariesConstants.DOCTOR_RANK);
+ //将名称汉字转为拼音
+ sysDictionaries.setDictionariesKey(Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(userRegVo.getDoctorRank(), true)));
+ sysDictionaries.setDictionariesName(userRegVo.getDoctorRank());
+ sysDictionaries.setCreateUserId(createUserId);
+ sysDictionaries.setCreateUserName(createUserName);
+ dicBool = sysDictionariesService.save(sysDictionaries);
+ if (dicBool) {
+ userRegVo.setDoctorRankId(sysDictionaries.getId());
+ }
}
+
+ if (dicBool) {
+ //写用户组织关系表
+ List<SysUserOrg> sysUserOrgList = new ArrayList<SysUserOrg>();
+ sysUserOrgH.setUserId(sysUser.getId());
+ sysUserOrgH.setOrgId(organizationHos);
+ sysUserOrgH.setFromLevel(CommonConstant.SYSTEM_ORG_HOS_LEVEL);
+ sysUserOrgH.setFromId(userRegVo.getHospitalId());
+ sysUserOrgH.setCreateUserId(isReg ? createUserId : sysUserd.getId());
+ sysUserOrgH.setCreateUserName(isReg ? createUserName : sysUserd.getUsername());
+ sysUserOrgList.add(sysUserOrgH);
+
+ sysUserOrgD.setUserId(sysUser.getId());
+ sysUserOrgD.setOrgId(organizationDep);
+ sysUserOrgD.setFromId(userRegVo.getDepartmentId());
+ sysUserOrgD.setFromLevel(CommonConstant.SYSTEM_ORG_DEP_LEVEL);
+ sysUserOrgD.setCreateUserId(isReg ? createUserId : sysUserd.getId());
+ sysUserOrgD.setCreateUserName(isReg ? createUserName : sysUserd.getUsername());
+ sysUserOrgList.add(sysUserOrgD);
+ boolean uOrg = iSysUserOrgService.saveBatch(sysUserOrgList);
+ if (uOrg) {
+ //写入医生数据
+ 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.setDoctorType(CommonConstant.H_DOCTOR_TYPE);
+ sysDoctor.setCreateUserId(isReg ? createUserId : sysUserd.getId());
+ sysDoctor.setCreateUserName(isReg ? createUserName : sysUserd.getUsername());
+ sysDoctor.setDoctorState(!isReg);
+ sysDoctor.setDoctorTel(userRegVo.getMobile());
+ sysDoctor.setDoctorName(userRegVo.getNickname());
+ sysDoctor.setServerUserId(isReg ? createUserId : sysUserd.getId());
+ sysDoctor.setServerUserName(isReg ? createUserName : sysUserd.getUsername());
+ sysDoctor.setIsAdminUser(false);
+ sysDoctor.setEnabled(!isReg);
+ if (sysDoctorMapper.insert(sysDoctor) == 1) {
+ //非自主注册的 返回信息带密码
+ if (!isReg) {
+ sysUser.setPassword(userRegVo.getPassword());
+ } else {
+ sysUser.setPassword("");
+ }
+ } else {
+ isSuccess = false;
+ expMsg = "医生数据写入失败";
+ }
+ } else {
+ isSuccess = false;
+ expMsg = "用户组织数据写入失败";
+ }
+ } else {
+ isSuccess = false;
+ expMsg = "职称数据写入失败";
+ }
+ } else {
+ //没有职务数据
+ isSuccess = false;
+ expMsg = "没有职称数据";
}
+ } else {
+ isSuccess = false;
+ expMsg = "角色绑定数据写入失败";
}
- else
- {
- //创建字典数据
- SysDictionaries sysDictionaries=new SysDictionaries();
- sysDictionaries.setDictionariesKey(DictionariesConstants.DOCTOR_RANK);
- sysDictionaries.setDictionariesClassId(DictionariesConstants.DOCTOR_RANK_ID.toString());
- //将名称汉字转为拼音
- sysDictionaries.setDictionariesKey("");
- sysDictionaries.setDictionariesName(userRegVo.getDoctorRank());
- sysDictionaries.setCreateUserId(0L);
- sysDictionaries.setCreateUserName("自动创建");
- boolean d=sysDictionariesService.save(sysDictionaries);
- if (d) {
- userRegVo.setDoctorRankId(sysDictionaries.getId());
- }
- }
+ } else {
+ isSuccess = false;
+ expMsg = "对应角色没有数据";
}
- //写入医生数据
- 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 {
+ isSuccess = false;
+ expMsg = "用户数据写入失败";
}
- else
- {
- return ResultBody.failed("用户数据写入失败");
+ /***返回数据***/
+ if (!isSuccess) {
+ return ResultBody.failed(expMsg);
+ } else {
+ return ResultBody.ok().data(sysUser);
+ }
+ }
+ /**
+ * 获取医院科室下的所有H端有效的医生
+ *
+ * @param hospitalId
+ * @param departmentId
+ * @return
+ */
+ @Override
+ public ResultBody hospitalDoctorList(Long hospitalId, Long departmentId, Boolean isIncluddel) {
+ if (hospitalId > 0 && departmentId > 0) {
+ List<HospitalDoctorListVo> listVoList;
+ if (isIncluddel) {
+ listVoList = baseMapper.hospitalDoctorListAndDel(hospitalId, departmentId, CommonConstant.HOSPITAL_DOCTOR_ID, CommonConstant.HOSPITAL_ADMIN_ID);
+ } else {
+ listVoList = baseMapper.hospitalDoctorList(hospitalId, departmentId, CommonConstant.HOSPITAL_DOCTOR_ID, CommonConstant.HOSPITAL_ADMIN_ID);
+ }
+ return ResultBody.ok().data(listVoList);
+ } else {
+ return ResultBody.failed("医院数据有误");
}
}
/**
* 检查手机号是否已经注册 true存在 false不存在
+ *
* @param phone
* @return
*/
- private boolean phoneIsUsed(String phone)
- {
+ public boolean phoneIsUsed(String phone) {
Map<String, Object> selectMap = new HashMap<>();
selectMap.put("mobile", phone);
+ selectMap.put("is_del", 0);
List<SysUser> sysUsers = baseMapper.selectByMap(selectMap);
- return (sysUsers.size()>0);
+ return (sysUsers.size() > 0);
}
+
+ /**
+ * 检查科室有效剩余账户数量
+ *
+ * @param depatmentId
+ * @return
+ */
+ public Integer departmetAccountsCount(Long depatmentId) {
+ SysDepartment sysDepartment = departmentService.getById(depatmentId);
+ if (sysDepartment == null) {
+ return 0;
+ } else {
+ Long sysHospitalId=HospitalIdByDepartmentId(depatmentId);
+ if (sysHospitalId>0) {
+ List<HospitalDoctorListVo> hospitalDoctorListVos = baseMapper.hospitalDoctorList(sysHospitalId, depatmentId, CommonConstant.HOSPITAL_DOCTOR_ID, CommonConstant.HOSPITAL_ADMIN_ID);
+ if (hospitalDoctorListVos != null) {
+ int doctorCount = hospitalDoctorListVos.size();
+ int accountCount = sysDepartment.getAccountsCount().intValue();
+ int liveCount=accountCount - doctorCount;
+ return liveCount;
+ } else {
+ return 0;
+ }
+ }
+ else
+ {
+ return 0;
+ }
+ }
+ }
+
+ /**
+ * 根据部门的id获取所属医院id
+ *
+ * @return
+ */
+ public Long HospitalIdByDepartmentId(Long departmentId) {
+ Long hospitalId = -1L;
+ SysDepartment sysDepartment = departmentService.getById(departmentId);
+ if (sysDepartment != null) {
+ //先获取科室的组织数据
+ SysOrganization sysOrganization = sysOrganizationMapper.selectById(sysDepartment.getOrgId());
+ if (sysOrganization != null) {
+ //获取上级组织id
+ sysOrganization = sysOrganizationMapper.selectById(sysOrganization.getOrgParentId());
+ if (sysOrganization != null) {
+ //根据组织id获取上级医院id
+ Map<String, Object> selectMap = new HashMap<>();
+ selectMap.put("org_id", sysOrganization.getId());
+ List<SysHospital> sysHospitalList = hospitalService.listByMap(selectMap);
+ if (sysHospitalList != null && sysHospitalList.size() > 0) {
+ //取第一个
+ hospitalId = sysHospitalList.get(0).getId();
+ }
+ }
+ }
+ }
+ return hospitalId;
+ }
+
/**
* 检查用户登录名是否已经注册 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();
}
+ /**
+ * 检查手机号是注册用户还是正式用户
+ *
+ * @param userTel
+ * @return
+ */
+ public ResultBody isRegUser(String userTel) {
+ if (StringUtils.isNotBlank(userTel)) {
+ List<SysUser> users = baseMapper.selectList(
+ new QueryWrapper<SysUser>().eq("username", userTel)
+ );
+ if (users != null && users.size() == 1) {
+ SysUser sysUser = users.get(0);
+ if (sysUser.getCreateUserId() == CommonConstant.CREATE_USER_ID && sysUser.getCreateUserName().equals(CommonConstant.CREATE_USER_NAME)) {
+ return ResultBody.ok().data(true);
+ }
+ return ResultBody.ok().data(false);
+ } else {
+ return ResultBody.failed("用户数据有误！");
+ }
+ } else {
+ return ResultBody.failed("必要参数有误！");
+ }
+ }
+
+ @Override
+ public ResultBody jiaMipython(String password) {
+ String encode = passwordEncoder.encode(password);
+ return ResultBody.ok().data(encode);
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0