From 8ea75b6f027f18f6daf229e43928f78b49740f79 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 04 Nov 2020 16:51:36 +0800
Subject: [PATCH] Merge branch 'dev'
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 162 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 106 insertions(+), 56 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 79c10bb..1fbec45 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
@@ -107,7 +107,11 @@
@Override
public LoginAppUser findByOpenId(String username) {
SysUser sysUser = this.selectByOpenId(username);
- return getLoginAppUser(sysUser);
+ if (sysUser == null) {
+ return null;
+ } else {
+ return getLoginAppUser(sysUser);
+ }
}
@Override
@@ -124,6 +128,7 @@
*/
@Override
public LoginAppUser getLoginAppUser(SysUser sysUserNew) {
+ log.error(sysUserNew.toString());
LoginAppUser loginAppUser = new LoginAppUser();
SysUser sysUser = this.baseMapper.selectById(sysUserNew);
if (sysUser != null) {
@@ -138,7 +143,6 @@
List<SysRole> sysRoles = roleUserService.findRolesByUserId(sysUser.getId());
// 设置角色
loginAppUser.setRoles(sysRoles);
-
if (!CollectionUtils.isEmpty(sysRoles)) {
Set<Long> roleIds = sysRoles.parallelStream().map(SuperEntity::getId).collect(Collectors.toSet());
List<SysMenu> menus = roleMenuMapper.findMenusByRoleIds(roleIds, CommonConstant.PERMISSION);
@@ -149,7 +153,6 @@
loginAppUser.setPermissions(permissions);
}
}
-
//医院信息
DoctorUserAll doctorUserAllVo = baseMapper.findDoctorUserAllData(sysUser.getId());
if (doctorUserAllVo != null) {
@@ -272,7 +275,7 @@
String oldTel = MapUtils.getString(params, "oldTel");
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();
+ String userPassword =MapUtils.getString(params, "userPassword");
if (id > 0 && StringUtils.isNotBlank(oldTel) && StringUtils.isNotBlank(newTel) && StringUtils.isNotBlank(authCode) && StringUtils.isNotBlank(userPassword)) {
//检查验证码
@@ -298,8 +301,8 @@
com.kidgrow.usercenter.model.SysDoctor newsysDoctorModel = new com.kidgrow.usercenter.model.SysDoctor();
if (sysDoctorModel != null) {
//理论上只有一个，如果有多个 只取第一个
- newsysDoctorModel.setId(sysDoctorModel.getId());
- newsysDoctorModel.setDoctorTel(newTel);
+ sysDoctorModel.setId(sysDoctorModel.getId());
+ sysDoctorModel.setDoctorTel(newTel);
sysDoctorMapper.updateById(newsysDoctorModel);
}
if (baseMapper.updateById(user) > 0) {
@@ -326,15 +329,13 @@
Page<SysUser> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
List<SysUser> list = baseMapper.findList(page, params);
long total = page.getTotal();
- if (total > 0) {
+ if (total > 0&&list.size()>0) {
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())));
+ if (userIds.size()>0) {
+ List<SysRole> sysRoles = roleUserService.findRolesByUserIds(userIds);
+ list.forEach(u -> u.setRoles(sysRoles.stream().filter(r -> !ObjectUtils.notEqual(u.getId(), r.getUserId()))
+ .collect(Collectors.toList())));
+ }
}
return PageResult.<SysUser>builder().data(list).code(0).count(total).build();
}
@@ -466,8 +467,8 @@
@Override
public ResultBody findCountByMap(Map<String, Object> map) {
- map.put("enable",1);
- map.put("isDel",0);
+ map.put("enable", 1);
+ map.put("isDel", 0);
Integer integer = baseMapper.selectCountByMap(map);
return ResultBody.ok().data(integer);
}
@@ -672,6 +673,10 @@
Long createUserId = CommonConstant.CREATE_USER_ID;
//创建人名称
String createUserName = CommonConstant.CREATE_USER_NAME;
+ //销售服务人员
+ SysUser sysUserSale = baseMapper.selectById(CommonConstant.SALE_USER_ID);
+ //运营服务人员
+ SysUser sysUserOpration = baseMapper.selectById(CommonConstant.OPRATION_USER_ID);
//是否注册用户
Boolean isReg = false;
//业务成功
@@ -679,8 +684,8 @@
//业务失败提示信息
String expMsg = "";
//系统内置的注册医院和科室的组织数据
- Long organizationHos = CommonConstant.HOSPITAL_ORG_ID;
- Long organizationDep = CommonConstant.DEPARTMENT_ORG_ID;
+ Long organizationHos = 0L;
+ Long organizationDep = 0L;
//检查判断是注册 还是添加用户，注册用户先走基本数据建设 医院/科室
SysUserOrg sysUserOrgH = new SysUserOrg();
SysUserOrg sysUserOrgD = new SysUserOrg();
@@ -690,44 +695,74 @@
isReg = true;
if (CheckVerificationCode(ConstantSMS.REGISTER_SMS, userRegVo.getMobile(), userRegVo.getVerification())) {
userRegVo.setDoctorState(true);
- //写医院数据
- SysHospital sysHospital = new SysHospital();
- sysHospital.setHospitalName(userRegVo.getHospitalName());
- sysHospital.setOrgId(organizationHos);
- //注册的用户所在医院默认是试用状态
- sysHospital.setHospitalState(0);
- sysHospital.setCreateUserId(createUserId);
- sysHospital.setCreateUserName(createUserName);
-
- boolean h = hospitalService.save(sysHospital);
- if (h) {
- userRegVo.setHospitalId(sysHospital.getId());
- //保存科室数据
- SysDepartment sysDepartment = new SysDepartment();
- sysDepartment.setOrgId(organizationDep);
- sysDepartment.setDepartmentName(userRegVo.getDepartmentName());
- sysDepartment.setSaleUserId(createUserId);
- sysDepartment.setAccountsCount(1);
- sysDepartment.setSaleUserName(createUserName);
- sysDepartment.setSaleUserTel("0");
- sysDepartment.setServerUserId(createUserId);
- sysDepartment.setServerUserTel("0");
- sysDepartment.setServerUserName(createUserName);
- boolean d = departmentService.save(sysDepartment);
- if (d) {
- userRegVo.setDepartmentId(sysDepartment.getId());
- //自动充入系统指定的试用套餐
- if (!saveProductDetail(sysHospital.getId(), sysDepartment.getId(), sysHospital.getHospitalName(), sysDepartment.getDepartmentName())) {
+ //写医院组织数据
+ SysOrganization sysOrganizationH = new SysOrganization();
+ sysOrganizationH.setOrgLevel(1);
+ sysOrganizationH.setOrgAttr(1);
+ sysOrganizationH.setOrgParentId(CommonConstant.ORG_PARENT_ID);
+ sysOrganizationH.setOrgName(userRegVo.getHospitalName());
+ sysOrganizationH.setCreateUserId(createUserId);
+ sysOrganizationH.setCreateUserName(createUserName);
+ if (organizationService.save(sysOrganizationH)) {
+ organizationHos=sysOrganizationH.getId();
+ //写科室组织数据
+ SysOrganization sysOrganizationD = new SysOrganization();
+ sysOrganizationD.setOrgLevel(2);
+ sysOrganizationD.setOrgAttr(2);
+ sysOrganizationD.setOrgParentId(sysOrganizationH.getId());
+ sysOrganizationD.setOrgName(userRegVo.getDepartmentName());
+ sysOrganizationD.setCreateUserId(createUserId);
+ sysOrganizationD.setCreateUserName(createUserName);
+ if (organizationService.save(sysOrganizationD)) {
+ organizationDep=sysOrganizationD.getId();
+ //写医院组织数据
+ SysHospital sysHospital = new SysHospital();
+ sysHospital.setHospitalName(userRegVo.getHospitalName());
+ sysHospital.setOrgId(sysOrganizationH.getId());
+ //注册的用户所在医院默认是试用状态
+ sysHospital.setHospitalState(0);
+ sysHospital.setCreateUserId(createUserId);
+ sysHospital.setCreateUserName(createUserName);
+ if (hospitalService.save(sysHospital)) {
+ userRegVo.setHospitalId(sysHospital.getId());
+ //保存科室数据
+ SysDepartment sysDepartment = new SysDepartment();
+ sysDepartment.setOrgId(sysOrganizationD.getId());
+ sysDepartment.setDepartmentName(userRegVo.getDepartmentName());
+ sysDepartment.setSaleUserId(sysUserSale.getId());
+ sysDepartment.setAccountsCount(1);
+ sysDepartment.setSaleUserName(sysUserSale.getNickname());
+ sysDepartment.setSaleUserTel(sysUserSale.getMobile());
+ sysDepartment.setServerUserId(sysUserOpration.getId());
+ sysDepartment.setServerUserTel(sysUserOpration.getMobile());
+ sysDepartment.setServerUserName(sysUserOpration.getNickname());
+ sysDepartment.setCreateUserId(createUserId);
+ sysDepartment.setCreateUserName(createUserName);
+ if (departmentService.save(sysDepartment)) {
+ userRegVo.setDepartmentId(sysDepartment.getId());
+ //自动充入系统指定的试用套餐
+ if (!saveProductDetail(sysHospital.getId(),
+ sysDepartment.getId(),
+ sysHospital.getHospitalName(),
+ sysDepartment.getDepartmentName())) {
+ isSuccess = false;
+ expMsg = "试用套餐充值失败";
+ }
+ } else {
+ isSuccess = false;
+ expMsg = "科室数据写入失败";
+ }
+ } else {
isSuccess = false;
- expMsg = "套餐充值失败";
+ expMsg = "医院数据写入失败";
}
} else {
isSuccess = false;
- expMsg = "科室数据写入失败";
+ expMsg = "科室组织数据写入失败";
}
} else {
isSuccess = false;
- expMsg = "医院数据写入失败";
+ expMsg = "医院组织数据写入失败";
}
} else {
return ResultBody.failed("无效的验证码");
@@ -787,22 +822,27 @@
if (StringUtils.isNotBlank(userRegVo.getDoctorRank())) {
//检查医生职务是否存在
Map<String, Object> selectMap = new HashMap<>();
- selectMap.put("dictionariesName", userRegVo.getDoctorRank());
+ selectMap.put("dictionariesNameAll", userRegVo.getDoctorRank().trim());
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())) {
+ if (dictionariesList.get(i).getDictionariesName().trim().equals(userRegVo.getDoctorRank().trim())) {
userRegVo.setDoctorRankId(dictionariesList.get(i).getId());
dicBool = true;
break;
}
}
- } else {
+ }
+ else {
//创建字典数据
sysDictionaries.setDictionariesClassId(DictionariesConstants.DOCTOR_RANK);
//将名称汉字转为拼音
- sysDictionaries.setDictionariesKey(Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(userRegVo.getDoctorRank(), true)));
+ String keyStr=Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(userRegVo.getDoctorRank(), true));
+ if (keyStr.length()>50) {
+ keyStr=keyStr.substring(0,49);
+ }
+ sysDictionaries.setDictionariesKey(keyStr);
sysDictionaries.setDictionariesName(userRegVo.getDoctorRank());
sysDictionaries.setCreateUserId(createUserId);
sysDictionaries.setCreateUserName(createUserName);
@@ -814,6 +854,10 @@
if (dicBool) {
//写用户组织关系表
+ SysHospital byId = hospitalService.getById(userRegVo.getHospitalId());
+ if(byId!=null){
+ organizationHos=byId.getOrgId();
+ }
List<SysUserOrg> sysUserOrgList = new ArrayList<SysUserOrg>();
sysUserOrgH.setUserId(sysUser.getId());
sysUserOrgH.setOrgId(organizationHos);
@@ -822,7 +866,10 @@
sysUserOrgH.setCreateUserId(isReg ? createUserId : sysUserd.getId());
sysUserOrgH.setCreateUserName(isReg ? createUserName : sysUserd.getUsername());
sysUserOrgList.add(sysUserOrgH);
-
+ SysDepartment department = departmentService.getById(userRegVo.getDepartmentId());
+ if(department!=null){
+ organizationDep=department.getOrgId();
+ }
sysUserOrgD.setUserId(sysUser.getId());
sysUserOrgD.setOrgId(organizationDep);
sysUserOrgD.setFromId(userRegVo.getDepartmentId());
@@ -846,8 +893,8 @@
sysDoctor.setDoctorState(!isReg);
sysDoctor.setDoctorTel(userRegVo.getMobile());
sysDoctor.setDoctorName(userRegVo.getNickname());
- sysDoctor.setServerUserId(isReg ? createUserId : sysUserd.getId());
- sysDoctor.setServerUserName(isReg ? createUserName : sysUserd.getUsername());
+ sysDoctor.setServerUserId(isReg ? sysUserSale.getId() : sysUserd.getId());
+ sysDoctor.setServerUserName(isReg ? sysUserSale.getNickname() : sysUserd.getUsername());
sysDoctor.setIsAdminUser(false);
sysDoctor.setDoctorCcie(userRegVo.getDoctorCcie());
sysDoctor.setEnabled(true);
@@ -930,6 +977,9 @@
} else {
listVoList = baseMapper.hospitalDoctorList(hospitalId, departmentId, CommonConstant.HOSPITAL_DOCTOR_ID, CommonConstant.HOSPITAL_ADMIN_ID);
}
+ listVoList.sort((e1,e2)->
+ e2.getUserId().compareTo(e1.getUserId())
+ );
return ResultBody.ok().data(listVoList);
} else {
return ResultBody.failed("医院数据有误");
--
Gitblit v1.8.0