From 9140edf9b115a6b38c599878093d595ef84228f1 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Sun, 12 Jul 2020 17:10:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java | 269 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 235 insertions(+), 34 deletions(-)
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 8d64181..5c1eed2 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
@@ -1,32 +1,35 @@
package com.kidgrow.usercenter.service.impl;
-import com.alibaba.fastjson.JSON;
+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.SecurityConstants;
import com.kidgrow.common.model.*;
+import com.kidgrow.common.service.impl.SuperServiceImpl;
+import com.kidgrow.common.utils.StringUtils;
import com.kidgrow.redis.util.RedisConstant;
import com.kidgrow.redis.util.RedisUtils;
+import com.kidgrow.usercenter.mapper.SysDoctorMapper;
+import com.kidgrow.usercenter.mapper.SysRoleMapper;
+import com.kidgrow.usercenter.mapper.SysUserRoleMapper;
+import com.kidgrow.usercenter.model.SysDoctor;
+import com.kidgrow.usercenter.model.SysRoleUser;
+import com.kidgrow.usercenter.service.ISysDoctorService;
import com.kidgrow.usercenter.service.ISysUserOrgService;
import com.kidgrow.usercenter.service.ISysUserService;
import com.kidgrow.usercenter.vo.SysDoctorDto;
import com.kidgrow.usercenter.vo.SysDoctorVo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cglib.beans.BeanCopier;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.kidgrow.common.service.impl.SuperServiceImpl;
-
-import java.util.*;
-
-import org.apache.commons.collections4.MapUtils;
-import lombok.extern.slf4j.Slf4j;
-
-import com.kidgrow.usercenter.model.SysDoctor;
-import com.kidgrow.usercenter.mapper.SysDoctorMapper;
-import com.kidgrow.usercenter.service.ISysDoctorService;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -53,11 +56,23 @@
@Autowired
private ISysUserOrgService sysUserOrgService;
@Autowired
- RedisUtils redisUtils;
+ private RedisUtils redisUtils;
+ @Autowired
+ private SysRoleOrganizationServiceImpl SysRoleOrganizationServiceImpl;
+ @Autowired
+ private SysRoleMapper sysRoleMapper;
+ @Autowired
+ private SysUserRoleMapper sysUserRoleMapper;
+ @Autowired
+ private SysUserServiceImpl sysUserServiceImpl;
+
+// private final String HOSPITAL_ADMIN="hospital_admin";
@Override
- public PageResult<SysDoctorVo> findList(Map<String, Object> params) {
+ public PageResult<SysDoctorVo> findList(Map<String, Object> params, SysUser user) {
Page<SysDoctor> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
+ //添加权限
+ SysRoleOrganizationServiceImpl.getRoleOrg(params, user);
List<SysDoctor> list = baseMapper.findList(page, params);
List<SysDoctorVo> listvo = new ArrayList<>();
list.forEach(e -> {
@@ -99,19 +114,32 @@
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");
SysDoctor sysDoctor = baseMapper.selectById(aLong);
+ Boolean enabled = MapUtils.getBoolean(params, "enabled");
if (sysDoctor != null && sysDoctor.getUserId() != null) {
SysUser byId = iSysUserService.getById(sysDoctor.getUserId());
if(byId!=null){
- byId.setEnabled(true);
+ byId.setEnabled(enabled);
iSysUserService.updateById(byId);
}
}
if(sysDoctor!=null){
- sysDoctor.setEnabled(true);
+
+ sysDoctor.setEnabled(enabled);
baseMapper.updateById(sysDoctor);
}else {
return ResultBody.failed("禁用失败");
@@ -120,12 +148,52 @@
}
@Override
- @Transactional
- public boolean saveOrUpdateSer(SysDoctorDto sysDoctor, HttpServletRequest request) {
+ @Transactional(rollbackFor = Exception.class)
+ public ResultBody saveOrUpdateSer(SysDoctorDto sysDoctor, HttpServletRequest request,SysUser user) {
String id = request.getHeader(SecurityConstants.USER_ID_HEADER);
if(null==sysDoctor){
- return false;
+ return ResultBody.failed("请填写信息");
}else {
+ if(sysDoctor.getRoles()==null||sysDoctor.getRoles().size()<=0){
+ return ResultBody.failed("选择一个角色");
+ }
+ /**
+ * 限制管理员只有一个
+ */
+
+ Boolean flag=false;
+ if(sysDoctor.getRoles().contains(CommonConstant.HOSPITAL_ADMIN_ID)){
+ //查询一个部门下的所有医生
+ QueryWrapper wrapper=new QueryWrapper();
+ wrapper.eq("is_del",0);
+ wrapper.eq("enabled",1);
+ wrapper.eq("department_id",sysDoctor.getDepartmentId());
+ List<SysDoctor> doctoerList = this.baseMapper.selectList(wrapper);
+ if(doctoerList.size()>0){
+ //查询role——user
+ List<Long> collect = doctoerList.stream().map(e -> e.getUserId()).collect(Collectors.toList());
+ wrapper=new QueryWrapper();
+ wrapper.in("user_id",collect);
+ List<SysRoleUser> list= this.sysUserRoleMapper.selectList(wrapper);
+
+ for (SysRoleUser sysRoleUser : list) {
+ if(sysRoleUser.getRoleId()==CommonConstant.HOSPITAL_ADMIN_ID){
+ flag=true;
+ }
+ }
+ }
+ }
+ if(flag){
+ return ResultBody.failed("该部门已经有管理员");
+ }
+ /**
+ * 限制只有创建医生的个数
+ *
+ */
+ if(sysUserServiceImpl.departmetAccountsCount(sysDoctor.getDepartmentId())<=0){
+ return ResultBody.failed("该部门创建人数已经达到上限");
+ }
+ Long departmentId = sysDoctor.getDepartmentId();
if (sysDoctor.getId()==null) {
//保存
SysUser sysUser=new SysUser();
@@ -134,8 +202,8 @@
sysUser.setNickname(sysDoctor.getHospitalName());
sysUser.setHeadImgUrl(sysDoctor.getDoctorLogo());
sysUser.setMobile(sysDoctor.getDoctorTel());
- sysUser.setType("doctor");
- sysUser.setTenantId("hospital");
+ sysUser.setType(CommonConstant.H_DOCTOR);
+ sysUser.setTenantId(CommonConstant.H_TENANT);
sysUser.setCreateTime(new Date());
SysUser byId = iSysUserService.getById(id);
if(byId!=null){
@@ -143,44 +211,177 @@
sysUser.setCreateUserName(byId.getUsername());
}
iSysUserService.save(sysUser);
+ //保存 角色信息
+// 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){
+ //保存一个角色
+ sysDoctor.getRoles().forEach(e->{
+ SysRoleUser sysRoleUser=new SysRoleUser();
+ sysRoleUser.setRoleId(e);
+ sysRoleUser.setUserId(sysUser.getId());
+ int insert = sysUserRoleMapper.insert(sysRoleUser);
+ });
//保存doctor的数据
SysDoctor sysDoc=new SysDoctor();
BeanCopier beanCopier = BeanCopier.create(SysDoctorDto.class, SysDoctor.class, false);
beanCopier.copy(sysDoctor,sysDoc,null);
sysDoc.setUserId(sysUser.getId());
+ if(user.getOrganizations()!=null){
+ List<SysOrganization> organizations = user.getOrganizations();
+ sysDoc.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
+ }
+
baseMapper.insert(sysDoc);
- //保存将sys_user_org
+ //保存将sys_user_org 保存部门
SysUserOrg sysUserOrg=new SysUserOrg();
sysUserOrg.setUserId(sysUser.getId());
- sysUserOrg.setEnabled(false);
sysUserOrg.setOrgId(sysDoctor.getDepartmentId());
- sysUserOrg.setCreateTime(new Date());
+ //保存公司
sysUserOrgService.saveOrUpdate(sysUserOrg);
+ SysUserOrg sysGongsi=new SysUserOrg();
+ sysGongsi.setUserId(sysUser.getId());
+ sysGongsi.setOrgId(sysDoctor.getHospitalId());
+ sysUserOrgService.saveOrUpdate(sysGongsi);
//保存到Redis
boolean hset = redisUtils.hset(RedisConstant.USER_ORGANIZATION, sysUserOrg.getUserId().toString(), sysUserOrg);
}else {
//更新
- redisUtils.hdel(RedisConstant.USER_ORGANIZATION, sysDoctor.getUserId().toString());
-// List<SysUserOrg> sysOrganizations = JSON.parseArray(JSON.toJSONString(redisUtils.hget(RedisConstant.USER_ORGANIZATION, sysDoctor.getUserId().toString())), SysUserOrg.class);
-// sysOrganizations.forEach( e-> {
-// if(e.getId()==sysDoctor.getId()){
-// sysOrganizations.set(0,sysDoctor);
-// }
-// });
+ SysDoctor getOne = baseMapper.selectById(sysDoctor.getId());
Map<String, Object> columnMap=new HashMap<>();
columnMap.put("user_id",sysDoctor.getUserId());
boolean b = sysUserOrgService.removeByMap(columnMap);
//保存将sys_user_org
SysUserOrg sysUserOrg=new SysUserOrg();
- sysUserOrg.setUserId(sysDoctor.getUserId());
+ sysUserOrg.setUserId(getOne.getUserId());
sysUserOrg.setEnabled(false);
sysUserOrg.setOrgId(sysDoctor.getDepartmentId());
sysUserOrg.setCreateTime(new Date());
sysUserOrgService.saveOrUpdate(sysUserOrg);
+ SysUserOrg sysGongsi=new SysUserOrg();
+ sysGongsi.setUserId(getOne.getId());
+ sysGongsi.setOrgId(sysDoctor.getHospitalId());
+ sysUserOrgService.saveOrUpdate(sysGongsi);
baseMapper.updateById(sysDoctor);
- redisUtils.hset(RedisConstant.USER_ORGANIZATION, sysUserOrg.getUserId().toString(), sysUserOrg);
+ if(redisUtils.hHasKey(RedisConstant.USER_ORGANIZATION, getOne.getUserId().toString())){
+ redisUtils.hdel(RedisConstant.USER_ORGANIZATION, getOne.getUserId().toString());
+ }
+ redisUtils.hset(RedisConstant.USER_ORGANIZATION, getOne.getUserId().toString(), sysUserOrg);
}
}
- return true;
+ return ResultBody.ok();
+ }
+
+ @Override
+ public List<SysDoctor> findByMap(Map<String, Object> map) {
+ map.put("enabled",1);
+ map.put("is_del",0);
+ return baseMapper.selectByMap(map);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public ResultBody setAdminDoctor(Map<String, Object> params) {
+ Long id = MapUtils.getLong(params, "id");
+ Long adminId = MapUtils.getLong(params, "adminId");
+ if (id>0&&adminId>0) {
+ Map<String,Object> map= new HashMap<>();
+ map.put("user_id",adminId);
+ List<SysDoctor> sysDoctors = baseMapper.selectByMap(map);
+ if(sysDoctors==null||sysDoctors.size()<=0){
+ return ResultBody.failed("当前操作用户不是管理员");
+ }
+ SysDoctor sysDoctor = sysDoctors.get(0);
+ //先检查操作用户是否管理员
+ if(sysDoctor!=null){
+ if (sysDoctor.getIsAdminUser()) {
+ //将超级管理员的角色设为普通角色
+ SysRoleUser sysRoleUser=new SysRoleUser();
+ sysRoleUser.setUserId(adminId);
+ sysRoleUser.setRoleId(CommonConstant.HOSPITAL_DOCTOR_ID);
+ QueryWrapper queryWrapper=new QueryWrapper();
+ queryWrapper.eq("user_id",adminId);
+ queryWrapper.eq("role_id",CommonConstant.HOSPITAL_ADMIN_ID);
+ int update = sysUserRoleMapper.update(sysRoleUser, queryWrapper);
+ //现将操作人员设为非管理角色
+ sysDoctor.setIsAdminUser(false);
+ if(baseMapper.updateById(sysDoctor)>0)
+ {
+ //再将新用户设为管理
+ sysDoctor=baseMapper.selectById(id);
+ if (sysDoctor != null) {
+ if (!sysDoctor.getIsAdminUser()) {
+ //现将普通人员设为管理角色
+ sysRoleUser=new SysRoleUser();
+ sysRoleUser.setUserId(sysDoctor.getUserId());
+ sysRoleUser.setRoleId(CommonConstant.HOSPITAL_ADMIN_ID);
+ queryWrapper=new QueryWrapper();
+ queryWrapper.eq("user_id",sysDoctor.getUserId());
+ queryWrapper.eq("role_id",CommonConstant.HOSPITAL_DOCTOR_ID);
+ sysUserRoleMapper.update(sysRoleUser, queryWrapper);
+ sysDoctor.setIsAdminUser(true);
+ if (baseMapper.updateById(sysDoctor)>0) {
+ return ResultBody.ok().data(true).msg("管理员设置成功！");
+ }
+ else
+ {
+ return ResultBody.failed("设为管理失败！").data(false);
+ }
+ }
+ else
+ {
+ return ResultBody.failed("设为管理失败，改用户就是管理员！").data(false);
+ }
+ }
+ else
+ {
+ return ResultBody.failed("用户信息有误！").data(false);
+ }
+ }
+ else
+ {
+ return ResultBody.failed("设为管理失败！").data(false);
+ }
+ }
+ else
+ {
+ return ResultBody.failed("当前操作用户不是管理员！").data(false);
+ }
+ }
+ else
+ {
+ return ResultBody.failed("用户信息有误！").data(false);
+ }
+
+ }
+ else
+ {
+ return ResultBody.failed("业务参数有误！").data(false);
+ }
+ }
+
+ /**
+ * 判断用户名是否管理员
+ * @param userName
+ * @return
+ */
+ @Override
+ public ResultBody userIsAdmin(String userName) {
+ if (StringUtils.isNotBlank(userName)) {
+ SysDoctor sysDoctor= baseMapper.userIsAdmin(userName);
+ if (sysDoctor != null) {
+ return ResultBody.ok().data(sysDoctor.getIsAdminUser());
+ }
+ else
+ {
+ return ResultBody.failed().data(false);
+ }
+ }else
+ {
+ return ResultBody.failed("用户名不能为空！").data(false);
+ }
}
}
--
Gitblit v1.8.0