From 76c53a0f0792a9406259dd78e1b8c20ae55dd546 Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <913652501@qq.com> Date: Mon, 11 May 2020 18:18:27 +0800 Subject: [PATCH] 添加 按钮根据 权限隐藏的功能 --- kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java | 101 +++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 90 insertions(+), 11 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 4fcd9b5..6ee3454 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,8 +1,18 @@ 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.ResultBody; -import com.kidgrow.common.model.SysUser; +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; import com.kidgrow.usercenter.vo.SysDoctorVo; @@ -10,14 +20,10 @@ import org.springframework.cglib.beans.BeanCopier; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; -import com.kidgrow.common.model.PageResult; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kidgrow.common.service.impl.SuperServiceImpl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import org.apache.commons.collections4.MapUtils; import lombok.extern.slf4j.Slf4j; @@ -51,10 +57,24 @@ private ISysUserService iSysUserService; @Autowired private PasswordEncoder passwordEncoder; + @Autowired + private ISysUserOrgService sysUserOrgService; + @Autowired + 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 -> { @@ -100,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("禁用失败"); @@ -118,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; @@ -140,17 +162,74 @@ 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 保存部门 + SysUserOrg sysUserOrg=new SysUserOrg(); + sysUserOrg.setUserId(sysUser.getId()); + sysUserOrg.setOrgId(sysDoctor.getDepartmentId()); + //保存公司 + 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 { //更新 + 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(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); + 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); + } } -- Gitblit v1.8.0