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 | 645 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 621 insertions(+), 24 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 9df44c3..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 @@ -1,19 +1,31 @@ package com.kidgrow.usercenter.service.impl; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; +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.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.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.ISysRoleUserService; -import com.kidgrow.usercenter.service.ISysUserService; +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.*; +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; @@ -26,8 +38,10 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import java.util.*; import java.util.stream.Collectors; + /** * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br> @@ -40,21 +54,40 @@ @Slf4j @Service public class SysUserServiceImpl extends SuperServiceImpl<SysUserMapper, SysUser> implements ISysUserService { - private final static String LOCK_KEY_USERNAME = CommonConstant.LOCK_KEY_PREFIX+"username:"; - + private final static String LOCK_KEY_USERNAME = CommonConstant.LOCK_KEY_PREFIX + "username:"; @Autowired private PasswordEncoder passwordEncoder; @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; + + @Autowired + private SysRoleMapper sysRoleMapper; + @Autowired + private SysUserRoleMapper sysUserRoleMapper; + + private final String HOSPITAL_ADMIN="hospital_admin"; @Override public LoginAppUser findByUsername(String username) { @@ -74,12 +107,21 @@ 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()); + //设置组织机构集合 + loginAppUser.setOrganizations(sysOrganizations); List<SysRole> sysRoles = roleUserService.findRolesByUserId(sysUser.getId()); // 设置角色 loginAppUser.setRoles(sysRoles); @@ -94,15 +136,24 @@ loginAppUser.setPermissions(permissions); } } - - return loginAppUser; + //是否医院管理员 + com.kidgrow.usercenter.model.SysDoctor sysDoctor = findDoctorByUserId(sysUser.getId()); + if (sysDoctor.getIsAdminUser() != null) { + loginAppUser.setHAdminUser(sysDoctor.getIsAdminUser()); + } + //医院信息 只有H端要返回的信息 + if (sysUser.getTenantId().toLowerCase().equals(CommonConstant.H_TENANT.toLowerCase())) { + DoctorUserAll doctorUserAllVo=baseMapper.findDoctorUserAllData(sysUser.getId()); + loginAppUser.setDoctorUserAllVO(doctorUserAllVo); + } } - return null; + return loginAppUser; } /** * 根据用户名查询用户 + * * @param username * @return */ @@ -110,13 +161,14 @@ 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) ); return getUser(users); } /** * 根据手机号查询用户 + * * @param mobile * @return */ @@ -130,6 +182,7 @@ /** * 根据openId查询用户 + * * @param openId * @return */ @@ -170,21 +223,99 @@ @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 @@ -196,6 +327,9 @@ List<Long> userIds = list.stream().map(SysUser::getId).collect(Collectors.toList()); List<SysRole> sysRoles = roleUserService.findRolesByUserIds(userIds); + +// Map<String, Object> map = new HashMap<String, Object>(); +// List<SysOrganization> sysOrganizationList=organizationService.fin(); list.forEach(u -> u.setRoles(sysRoles.stream().filter(r -> !ObjectUtils.notEqual(u.getId(), r.getUserId())) .collect(Collectors.toList()))); } @@ -232,13 +366,14 @@ 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(); boolean result = super.saveOrUpdateIdempotency(sysUser, lock - , LOCK_KEY_USERNAME+username, new QueryWrapper<SysUser>().eq("username", username) - , username+"已存在"); + , LOCK_KEY_USERNAME + username, new QueryWrapper<SysUser>().eq("username", username) + , username + "已存在"); // boolean result=true; //更新角色 if (result && StrUtil.isNotEmpty(sysUser.getRoleId())) { @@ -253,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; } @@ -272,4 +421,452 @@ } return sysUserExcels; } + + @Override + public ResultBody findAll(Map<String, Object> map) { + List<SysUser> sysUsers = baseMapper.selectByMap(map); + return ResultBody.ok().data(sysUsers).msg("操作成功"); + } + + /** + * 获取当前用的 组织下的所有人员 + * + * @param request + * @return + */ + @Override + public ResultBody getThisUserOrganizationUser(HttpServletRequest request) { + String id = request.getHeader(SecurityConstants.USER_ID_HEADER); + List<SysUser> sysUsers = new ArrayList<>(); + if (StringUtils.isNotBlank(id)) { + QueryWrapper<SysUserOrg> queryWrapper = new QueryWrapper(); + queryWrapper.eq("user_id", id); + List<SysUserOrg> list = iSysUserOrgService.list(queryWrapper); + if (list.size() > 0) { + List<Long> collect = list.stream().map(e -> e.getOrgId()).collect(Collectors.toList()); + if (collect.size() > 0) { + queryWrapper = new QueryWrapper<>(); + queryWrapper.in("org_id", collect); + List<SysUserOrg> sysUserOrgs = iSysUserOrgService.list(queryWrapper); + List<Long> userIds = sysUserOrgs.stream().map(e -> e.getUserId()).collect(Collectors.toList()); + QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper(); + sysUserQueryWrapper.in("id", userIds.stream().distinct().collect(Collectors.toList())); + sysUsers = baseMapper.selectList(sysUserQueryWrapper); + } + } + } else { + return ResultBody.failed("暂无数据"); + } + return ResultBody.ok().data(sysUsers); + } + + @Override + public ResultBody findCountByMap(Map<String, Object> map) { + Integer integer = baseMapper.selectCountByMap(map); + return ResultBody.ok().data(integer); + } + + /** + * 通过手机号 修改密码 + * + * @param map + * @return + */ + @Override + public ResultBody passwordByPhone(Map<String, Object> map) { + //手机号,type,验证码,新密码 + String phone = MapUtils.getString(map, "phone"); + if (phone == null || "".equals(phone.trim())) { + return ResultBody.failed("请输入手机号"); + } + String verificationCode = MapUtils.getString(map, "verificationCode"); + if (verificationCode == null || "".equals(verificationCode.trim())) { + return ResultBody.failed("请输入验证码"); + } + String newPass = MapUtils.getString(map, "newPass"); + 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("验证码超时"); + } + } else { + return ResultBody.failed("验证码错误"); + } + } else { + return ResultBody.failed("该手机号没有验证码"); + } + } + + /** + * 通过手机号 注册验证 + * + * @param map + * @return + */ + @Override + public ResultBody registerByPhone(Map<String, Object> map) { + //手机号,type,验证码,新密码 + String phone = MapUtils.getString(map, "phone"); + if (phone == null || "".equals(phone.trim())) { + return ResultBody.failed("请输入手机号"); + } + if (phoneIsUsed(phone)) { + return ResultBody.failed("该手机号已经注册"); + } + + 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) { + String password = MapUtils.getString(map, "password"); + if (StringUtils.isBlank(password)) { + return ResultBody.failed("请输入密码"); + } + 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)) { + return ResultBody.failed("请输入验证码"); + } + if (!passwordEncoder.matches(sysUser.getPassword(), password)) { + return ResultBody.failed("密码错误"); + } + Object hget = redisUtils.hget(ConstantSMS.PHONE_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) { + return ResultBody.failed("该手机号已经注册"); + } else { + SysUser user = new SysUser(); + user.setId(sysUser.getId()); + user.setMobile(phone); + baseMapper.updateById(user); + //将Redis 清除 + redisUtils.hdel(ConstantSMS.PHONE_SMS, phone); + return ResultBody.ok(); + } + } else { + return ResultBody.failed("验证码超时"); + } + } else { + return ResultBody.failed("验证码错误"); + } + } else { + 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()); + 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) { + return sysDoctorList.get(0); + } + return new com.kidgrow.usercenter.model.SysDoctor(); + } } \ No newline at end of file -- Gitblit v1.8.0