From 8190823a593d3123384d3a75774ad19ecea07204 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 15 Jun 2020 11:20:12 +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 | 181 ++++++++++++++++++++++++++++++++------------
1 files changed, 130 insertions(+), 51 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 a5cdc88..ec7fa0d 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,37 +1,32 @@
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.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.SysRoleOrganizationMapper;
-import com.kidgrow.usercenter.model.SysRoleOrganization;
-import com.kidgrow.usercenter.service.ISysRoleOrganizationService;
+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.*;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -60,30 +55,19 @@
@Autowired
private RedisUtils redisUtils;
@Autowired
- private SysRoleOrganizationMapper sysRoleOrganizationMapper;
+ private SysRoleOrganizationServiceImpl SysRoleOrganizationServiceImpl;
@Autowired
private SysRoleMapper sysRoleMapper;
+ @Autowired
+ private SysUserRoleMapper sysUserRoleMapper;
+
+ private final String HOSPITAL_ADMIN="hospital_admin";
@Override
public PageResult<SysDoctorVo> findList(Map<String, Object> params, SysUser user) {
Page<SysDoctor> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
- List<SysRole> roles = user.getRoles();
- List<Map<SysRole,List<SysRoleOrganization>>> listroleOrg=new ArrayList<>();
- if (!roles.isEmpty()) {
- roles.forEach(e->{
- Map<SysRole,List<SysRoleOrganization>> rolemap=new HashMap<>();
- Map<String,Object> map=new HashMap<>();
- map.put("role_id",e.getId());
- List<SysRoleOrganization> sysRoleOrganizations = sysRoleOrganizationMapper.selectByMap(map);
- if(sysRoleOrganizations.size()>0){
- SysRole sysRole = sysRoleMapper.selectById(e.getId());
- rolemap.put(sysRole,sysRoleOrganizations);
- listroleOrg.add(rolemap);
- }
- });
- }
-
- params.put("likes",listroleOrg);
+ //添加权限
+ SysRoleOrganizationServiceImpl.getRoleOrg(params, user);
List<SysDoctor> list = baseMapper.findList(page, params);
List<SysDoctorVo> listvo = new ArrayList<>();
list.forEach(e -> {
@@ -129,15 +113,17 @@
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("禁用失败");
@@ -147,7 +133,7 @@
@Override
@Transactional
- public boolean saveOrUpdateSer(SysDoctorDto sysDoctor, HttpServletRequest request) {
+ public boolean saveOrUpdateSer(SysDoctorDto sysDoctor, HttpServletRequest request,SysUser user) {
String id = request.getHeader(SecurityConstants.USER_ID_HEADER);
if(null==sysDoctor){
return false;
@@ -160,8 +146,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){
@@ -169,44 +155,137 @@
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){
+ //保存一个角色
+ SysRole sysRole = sysRoles.get(0);
+ SysRoleUser sysRoleUser=new SysRoleUser();
+ sysRoleUser.setRoleId(sysRole.getId());
+ 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;
}
+
+ @Override
+ public List<SysDoctor> findByMap(Map<String, Object> map) {
+ map.put("enabled",1);
+ map.put("is_del",0);
+ return baseMapper.selectByMap(map);
+ }
+
+ @Override
+ @Transactional
+ 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("id",adminId);
+ SysDoctor sysDoctor=baseMapper.selectById(adminId);
+ //先检查操作用户是否管理员
+ if(sysDoctor!=null){
+ if (sysDoctor.getIsAdminUser()) {
+ //现将操作人员设为非管理
+ sysDoctor=new SysDoctor();
+ sysDoctor.setIsAdminUser(false);
+ if(baseMapper.updateById(sysDoctor)>0)
+ {
+ //再将新用户设为管理
+ sysDoctor=baseMapper.selectById(id);
+ if (sysDoctor != null) {
+ if (!sysDoctor.getIsAdminUser()) {
+ sysDoctor=new SysDoctor();
+ 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);
+ }
+ }
}
--
Gitblit v1.8.0