From de123f4416ae566471701d5d7a3a8b5ca746cfa3 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 16 Jun 2020 11:28:59 +0800
Subject: [PATCH] 新增接口：删除用户，获取用户登录后信息
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java | 4
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysDoctorService.java | 7 +
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 184 ++++++++++++++++++++----------------
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysOrganizationService.java | 7 +
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java | 11 ++
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/UserRegVo.java | 4
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysOrganizationServiceImpl.java | 45 +++++---
7 files changed, 158 insertions(+), 104 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/UserRegVo.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/UserRegVo.java
index 6fecb03..7b6a572 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/UserRegVo.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/UserRegVo.java
@@ -97,4 +97,8 @@
*/
@NotNull(message = "医生状态 1正常 0试用不能为空")
private Boolean doctorState;
+ /**
+ * 资质证书 图片地址
+ */
+ private String doctorCcie;
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysDoctorService.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysDoctorService.java
index e22542c..616b200 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysDoctorService.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysDoctorService.java
@@ -56,5 +56,12 @@
* @return
*/
ResultBody userIsAdmin(String userName);
+
+ /**
+ * 根据userid删除医生数据
+ * @param userId
+ * @return
+ */
+ int deleteByUserId(Long userId);
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysOrganizationService.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysOrganizationService.java
index b904bee..282563d 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysOrganizationService.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysOrganizationService.java
@@ -57,5 +57,12 @@
ResultBody getTree(Map<String, Object> params);
boolean saveOrUpdateSer(SysOrganization sysOrganization);
+
+ /**
+ * 根据userid删除组织对应数据
+ * @param userId
+ * @return
+ */
+ int deleteByUserId(Long userId);
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
index abab3a4..9102b36 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
@@ -110,6 +110,17 @@
return true;
}
+ /**
+ * 根据userid删除医生数据
+ * @param userId
+ * @return
+ */
+ @Override
+ public int deleteByUserId(Long userId) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("userId", userId);
+ return baseMapper.deleteByMap(params);
+ }
@Override
public ResultBody enable(Map<String, Object> params) {
Long aLong = MapUtils.getLong(params,"id");
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysOrganizationServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysOrganizationServiceImpl.java
index 09a1b2d..90a1bdf 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysOrganizationServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysOrganizationServiceImpl.java
@@ -9,6 +9,7 @@
import com.kidgrow.redis.util.RedisConstant;
import com.kidgrow.redis.util.RedisUtils;
import com.kidgrow.usercenter.mapper.SysOrganizationMapper;
+import com.kidgrow.usercenter.mapper.SysUserOrgMapper;
import com.kidgrow.usercenter.service.ISysOrganizationService;
import com.kidgrow.usercenter.vo.SysOrganizationVo;
import lombok.extern.slf4j.Slf4j;
@@ -18,10 +19,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -38,7 +36,8 @@
public class SysOrganizationServiceImpl extends SuperServiceImpl<SysOrganizationMapper, SysOrganization> implements ISysOrganizationService {
@Autowired
RedisUtils redisUtils;
-
+ @Autowired
+ SysUserOrgMapper sysUserOrgMapper;
/**
* 列表
*
@@ -142,6 +141,13 @@
return ResultBody.ok().data(treeData);
}
+ @Override
+ public int deleteByUserId(Long userId) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("userId", userId);
+ return sysUserOrgMapper.deleteByMap(params);
+ }
+
/**
* 将数据 封装成 tree （递归方式）
*
@@ -156,7 +162,7 @@
for (Long id : idList
) {
Map<String, Object> map = new HashMap<>();
- map.put("id", ""+id);
+ map.put("id", "" + id);
map.put("name", collect.get(id).getOrgName());
map.put("level", collect.get(id).getOrgLevel());
map.put("parentId", collect.get(id).getOrgParentId());
@@ -189,7 +195,7 @@
} else {
//更新
SysOrganization sysOrg = baseMapper.selectById(sysOrganization.getId());
- if(sysOrg.getOrgParentId()!=sysOrganization.getOrgParentId()){
+ if (sysOrg.getOrgParentId() != sysOrganization.getOrgParentId()) {
String code = this.getCode(sysOrganization);
sysOrganization.setOrgCode(code);
}
@@ -203,36 +209,37 @@
/**
* 获取自己组织的code
+ *
* @param sysOrganization
* @return
*/
- public String getCode(SysOrganization sysOrganization){
+ public String getCode(SysOrganization sysOrganization) {
//获取父级
Long orgParentId = sysOrganization.getOrgParentId();
if (orgParentId == null) {
return null;
}
SysOrganization sysOrg = baseMapper.selectById(orgParentId);
- if(sysOrg!=null){
+ if (sysOrg != null) {
String orgCode = sysOrg.getOrgCode();
//查询
- QueryWrapper queryWrapper=new QueryWrapper();
- queryWrapper.eq("org_parent_id",sysOrg.getId());
+ QueryWrapper queryWrapper = new QueryWrapper();
+ queryWrapper.eq("org_parent_id", sysOrg.getId());
queryWrapper.orderByAsc("id");
List<SysOrganization> list = baseMapper.selectList(queryWrapper);
- if (list.size()>0) {
+ if (list.size() > 0) {
SysOrganization sysOrganizationLast = list.get(list.size() - 1);
String orgCodeLast = sysOrganizationLast.getOrgCode();
- String orgCodeLastQianZhui=orgCodeLast.substring(0,orgCodeLast.length() - 4);
+ String orgCodeLastQianZhui = orgCodeLast.substring(0, orgCodeLast.length() - 4);
Integer codenum = Integer.valueOf(orgCodeLast.substring(orgCodeLast.length() - 4));
- String str="0000";
- str+=(codenum+1);
+ String str = "0000";
+ str += (codenum + 1);
String substring = str.substring(str.length() - 4);
- return orgCodeLastQianZhui+substring;
- }else {
+ return orgCodeLastQianZhui + substring;
+ } else {
String fucode = sysOrg.getOrgCode();
- String str="0001";
- return fucode+str;
+ String str = "0001";
+ return fucode + str;
}
}
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 5dc3489..23d5af5 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
@@ -101,8 +101,8 @@
}
/**
- *
* 获取登录用户的一系列信息 hrj 06-04修改
+ *
* @param sysUser
* @return
*/
@@ -130,7 +130,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());
}
@@ -215,7 +215,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())) {
@@ -223,7 +223,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);
@@ -232,10 +232,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);
}
}
@@ -249,7 +248,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) {
@@ -277,9 +276,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);
@@ -287,7 +286,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("手机号修改失败！");
@@ -359,7 +358,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);
}
@@ -381,10 +380,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;
}
@@ -447,6 +460,7 @@
/**
* 通过手机号 修改密码
+ *
* @param map
* @return
*/
@@ -503,6 +517,7 @@
/**
* 通过手机号 注册验证
+ *
* @param map
* @return
*/
@@ -517,19 +532,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("请输入密码");
@@ -538,14 +554,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());
@@ -586,24 +602,27 @@
@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
*/
@@ -614,27 +633,27 @@
return ResultBody.failed("该手机号已经注册");
}
//检查判断是注册 还是添加用户，注册用户先走基本数据建设
- if (userRegVo.getHospitalId()==null) {
+ if (StringUtils.isBlank(userRegVo.getHospitalId().toString())) {
userRegVo.setDoctorState(true);
//添加医院组织结构数据
- List<SysOrganization> sysOrganizationList=new ArrayList<SysOrganization>();
- SysOrganization sysOrganizationHos=new SysOrganization();
+ 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();
+ SysOrganization sysOrganizationDe = new SysOrganization();
sysOrganizationDe.setOrgAttr(2);
sysOrganizationDe.setOrgLevel(2);
sysOrganizationDe.setOrgName(userRegVo.getDepartmentName());
sysOrganizationList.add(sysOrganizationDe);
//批量写入
- boolean orgRe= organizationService.saveBatch(sysOrganizationList);
+ boolean orgRe = organizationService.saveBatch(sysOrganizationList);
if (orgRe) {
//写医院数据
- SysHospital sysHospital=new SysHospital();
+ SysHospital sysHospital = new SysHospital();
sysHospital.setHospitalName(userRegVo.getHospitalName());
sysHospital.setOrgId(sysOrganizationHos.getId());
sysHospital.setAccountsCount(1);
@@ -642,11 +661,11 @@
sysHospital.setCreateUserId(0L);
sysHospital.setCreateUserName("自主注册");
- boolean h=hospitalService.save(sysHospital);
+ boolean h = hospitalService.save(sysHospital);
if (h) {
userRegVo.setHospitalId(sysHospital.getId());
//保存科室数据
- SysDepartment sysDepartment=new SysDepartment();
+ SysDepartment sysDepartment = new SysDepartment();
sysDepartment.setHospitalId(sysHospital.getId());
sysDepartment.setOrgId(sysOrganizationDe.getId());
sysDepartment.setDepartmentName(userRegVo.getDepartmentName());
@@ -655,37 +674,30 @@
sysDepartment.setSaleUserTel("0");
sysDepartment.setServerUserId(0L);
sysDepartment.setServerUserTel("0");
- boolean d=departmentService.save(sysDepartment);
+ boolean d = departmentService.save(sysDepartment);
if (!d) {
return ResultBody.failed("科室数据写入失败");
- }
- else
- {
+ } else {
userRegVo.setDepartmentId(sysDepartment.getId());
}
- }
- else
- {
+ } else {
return ResultBody.failed("医院数据写入失败");
}
- }
- else
- {
+ } else {
return ResultBody.failed("组织数据写入失败");
}
}
//添加用户数据 如果没有输入密码，将会创建一个默认密码返回
- String defaultPassWord="";
- SysUser sysUser=new SysUser();
+ 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);
+ 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);
}
@@ -694,36 +706,30 @@
sysUser.setEnabled(true);
if (StringUtils.isNotBlank(userRegVo.getType())) {
sysUser.setType(userRegVo.getType());
- }
- else
- {
+ } 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)
- {
+ 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) {
+ 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
- {
+ } else {
//创建字典数据
- SysDictionaries sysDictionaries=new SysDictionaries();
+ SysDictionaries sysDictionaries = new SysDictionaries();
sysDictionaries.setDictionariesKey(DictionariesConstants.DOCTOR_RANK);
sysDictionaries.setDictionariesClassId(DictionariesConstants.DOCTOR_RANK_ID.toString());
//将名称汉字转为拼音
@@ -731,14 +737,14 @@
sysDictionaries.setDictionariesName(userRegVo.getDoctorRank());
sysDictionaries.setCreateUserId(0L);
sysDictionaries.setCreateUserName("自动创建");
- boolean d=sysDictionariesService.save(sysDictionaries);
+ boolean d = sysDictionariesService.save(sysDictionaries);
if (d) {
userRegVo.setDoctorRankId(sysDictionaries.getId());
}
}
}
//写入医生数据
- SysDoctor sysDoctor=new SysDoctor();
+ SysDoctor sysDoctor = new SysDoctor();
sysDoctor.setUserId(sysUser.getId());
sysDoctor.setHospitalId(userRegVo.getHospitalId());
sysDoctor.setHospitalName(userRegVo.getHospitalName());
@@ -753,56 +759,68 @@
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
- {
+ if (sysDoctorMapper.insert(sysDoctor) == 1) {
+ if (StringUtils.isNotBlank(defaultPassWord)) {
+ //默认密码需要返回
+ sysUser.setPassword(defaultPassWord);
+ }
+ else
+ {
+ sysUser.setPassword("");
+ }
+ return ResultBody.ok(200, "注册成功").data(sysUser);
+ } else {
return ResultBody.failed("医生数据写入失败");
}
- }
- else
- {
+ } 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();
}
+ public ResultBody userIsAdmin(String userName) {
+
+ Map<String, Object> selectMap = new HashMap<>();
+ selectMap.put("username", userName);
+ List<SysUser> sysUsers = baseMapper.selectByMap(selectMap);
+
+ return null;
+ }
}
\ No newline at end of file
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
index dc15918..d664be1 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
@@ -293,8 +293,8 @@
if (checkAdmin(id)) {
return ResultBody.failed(ADMIN_CHANGE_MSG);
}
- appUserService.delUser(id);
- return ResultBody.ok().msg("删除成功").data(true);
+ boolean v= appUserService.delUser(id);
+ return ResultBody.ok().msg("删除成功").data(v);
}
--
Gitblit v1.8.0