From b67a622b2becc49a2ae23fa905bc775411439bfa Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Mon, 27 Apr 2020 16:54:24 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java | 64 ++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 8 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..938e2b0 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,10 +1,17 @@
package com.kidgrow.usercenter.service.impl;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.kidgrow.common.constant.SecurityConstants;
import com.kidgrow.common.model.*;
import com.kidgrow.redis.util.RedisConstant;
import com.kidgrow.redis.util.RedisUtils;
+import com.kidgrow.usercenter.mapper.SysRoleMapper;
+import com.kidgrow.usercenter.mapper.SysRoleOrganizationMapper;
+import com.kidgrow.usercenter.mapper.SysUserRoleMapper;
+import com.kidgrow.usercenter.model.SysRoleOrganization;
+import com.kidgrow.usercenter.model.SysRoleUser;
+import com.kidgrow.usercenter.service.ISysRoleOrganizationService;
import com.kidgrow.usercenter.service.ISysUserOrgService;
import com.kidgrow.usercenter.service.ISysUserService;
import com.kidgrow.usercenter.vo.SysDoctorDto;
@@ -53,11 +60,21 @@
@Autowired
private ISysUserOrgService sysUserOrgService;
@Autowired
- RedisUtils redisUtils;
+ private RedisUtils redisUtils;
+ @Autowired
+ 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) {
+ 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 -> {
@@ -103,15 +120,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("禁用失败");
@@ -121,7 +140,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;
@@ -143,19 +162,41 @@
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 {
@@ -183,4 +224,11 @@
}
return true;
}
+
+ @Override
+ public List<SysDoctor> findByMap(Map<String, Object> map) {
+ map.put("enabled",1);
+ map.put("is_del",0);
+ return baseMapper.selectByMap(map);
+ }
}
--
Gitblit v1.8.0