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 | 98 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 80 insertions(+), 18 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 5ad210f..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,5 +1,6 @@
package com.kidgrow.usercenter.service.impl;
+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;
@@ -28,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.*;
+import java.util.stream.Collectors;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -61,8 +63,10 @@
private SysRoleMapper sysRoleMapper;
@Autowired
private SysUserRoleMapper sysUserRoleMapper;
+ @Autowired
+ private SysUserServiceImpl sysUserServiceImpl;
- private final String HOSPITAL_ADMIN="hospital_admin";
+// private final String HOSPITAL_ADMIN="hospital_admin";
@Override
public PageResult<SysDoctorVo> findList(Map<String, Object> params, SysUser user) {
@@ -145,11 +149,51 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean saveOrUpdateSer(SysDoctorDto sysDoctor, HttpServletRequest request,SysUser user) {
+ 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();
@@ -168,19 +212,19 @@
}
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){
+// 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);
+ sysDoctor.getRoles().forEach(e->{
SysRoleUser sysRoleUser=new SysRoleUser();
- sysRoleUser.setRoleId(sysRole.getId());
+ 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);
@@ -228,7 +272,7 @@
redisUtils.hset(RedisConstant.USER_ORGANIZATION, getOne.getUserId().toString(), sysUserOrg);
}
}
- return true;
+ return ResultBody.ok();
}
@Override
@@ -245,13 +289,24 @@
Long adminId = MapUtils.getLong(params, "adminId");
if (id>0&&adminId>0) {
Map<String,Object> map= new HashMap<>();
- map.put("id",adminId);
- SysDoctor sysDoctor=baseMapper.selectById(adminId);
+ 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()) {
- //现将操作人员设为非管理
- sysDoctor=new SysDoctor();
+ //将超级管理员的角色设为普通角色
+ 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)
{
@@ -259,7 +314,14 @@
sysDoctor=baseMapper.selectById(id);
if (sysDoctor != null) {
if (!sysDoctor.getIsAdminUser()) {
- sysDoctor=new SysDoctor();
+ //现将普通人员设为管理角色
+ 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("管理员设置成功！");
--
Gitblit v1.8.0