From c8c0f4c93862bf18f804dcdc017ea7affc09bc90 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 21 十一月 2024 14:38:02 +0800
Subject: [PATCH] 11.21

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java |  417 +----------------------------------------------------------
 1 files changed, 10 insertions(+), 407 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
index 3c52cfc..1b05681 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -1,417 +1,20 @@
 package com.ruoyi.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.system.domain.SysRoleDept;
-import com.ruoyi.system.domain.SysRoleMenu;
-import com.ruoyi.system.domain.SysUserRole;
-import com.ruoyi.system.mapper.SysRoleDeptMapper;
-import com.ruoyi.system.mapper.SysRoleMapper;
-import com.ruoyi.system.mapper.SysRoleMenuMapper;
-import com.ruoyi.system.mapper.SysUserRoleMapper;
-import com.ruoyi.system.service.ISysRoleService;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.account.mapper.SysRoleMapper;
+import com.ruoyi.system.api.model.SysRole;
+import com.ruoyi.account.service.SysRoleService;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.datascope.annotation.DataScope;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.SysRole;
-import com.ruoyi.system.api.domain.SysUser;
 
 /**
- * 角色 业务层处理
+ * <p>
+ *  服务实现类
+ * </p>
  *
- * @author ruoyi
+ * @author luodangjia
+ * @since 2024-11-21
  */
 @Service
-public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
-	@Autowired
-	private SysRoleMapper roleMapper;
-	
-	@Autowired
-	private SysRoleMenuMapper roleMenuMapper;
-	
-	@Autowired
-	private SysUserRoleMapper userRoleMapper;
-	
-	@Autowired
-	private SysRoleDeptMapper roleDeptMapper;
-	
-	/**
-	 * 根据条件分页查询角色数据
-	 *
-	 * @param role 角色信息
-	 * @return 角色数据集合信息
-	 */
-	@Override
-	@DataScope(deptAlias = "d")
-	public List<SysRole> selectRoleList(SysRole role) {
-		return roleMapper.selectRoleList(role);
-	}
-	
-	/**
-	 * 根据用户ID查询角色
-	 *
-	 * @param userId 用户ID
-	 * @return 角色列表
-	 */
-	@Override
-	public List<SysRole> selectRolesByUserId(Long userId) {
-		List<SysRole> userRoles = roleMapper.selectRolePermissionByUserId(userId);
-		List<SysRole> roles = selectRoleAll();
-		for (SysRole role : roles) {
-			for (SysRole userRole : userRoles) {
-				if (role.getRoleId().longValue() == userRole.getRoleId().longValue()) {
-					role.setFlag(true);
-					break;
-				}
-			}
-		}
-		return roles;
-	}
-	
-	/**
-	 * 根据用户ID查询权限
-	 *
-	 * @param userId 用户ID
-	 * @return 权限列表
-	 */
-	@Override
-	public Set<String> selectRolePermissionByUserId(Long userId) {
-		List<SysRole> perms = roleMapper.selectRolePermissionByUserId(userId);
-		Set<String> permsSet = new HashSet<>();
-		for (SysRole perm : perms) {
-			if (StringUtils.isNotNull(perm)) {
-				permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(",")));
-			}
-		}
-		return permsSet;
-	}
-	
-	/**
-	 * 查询所有角色
-	 *
-	 * @return 角色列表
-	 */
-	@Override
-	public List<SysRole> selectRoleAll() {
-		return SpringUtils.getAopProxy(this).selectRoleList(new SysRole());
-	}
-	
-	/**
-	 * 根据用户ID获取角色选择框列表
-	 *
-	 * @param userId 用户ID
-	 * @return 选中角色ID列表
-	 */
-	@Override
-	public List<Long> selectRoleListByUserId(Long userId) {
-		return roleMapper.selectRoleListByUserId(userId);
-	}
-	
-	/**
-	 * 通过角色ID查询角色
-	 *
-	 * @param roleId 角色ID
-	 * @return 角色对象信息
-	 */
-	@Override
-	public SysRole selectRoleById(Long roleId) {
-		return roleMapper.selectRoleById(roleId);
-	}
-	
-	/**
-	 * 校验角色名称是否唯一
-	 *
-	 * @param role 角色信息
-	 * @return 结果
-	 */
-	@Override
-	public boolean checkRoleNameUnique(SysRole role) {
-		Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
-		SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName());
-		if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) {
-			return UserConstants.NOT_UNIQUE;
-		}
-		return UserConstants.UNIQUE;
-	}
-	
-	/**
-	 * 校验角色权限是否唯一
-	 *
-	 * @param role 角色信息
-	 * @return 结果
-	 */
-	@Override
-	public boolean checkRoleKeyUnique(SysRole role) {
-		Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
-		SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey());
-		if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) {
-			return UserConstants.NOT_UNIQUE;
-		}
-		return UserConstants.UNIQUE;
-	}
-	
-	/**
-	 * 校验角色是否允许操作
-	 *
-	 * @param role 角色信息
-	 */
-	@Override
-	public void checkRoleAllowed(SysRole role) {
-		if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin()) {
-			throw new ServiceException("不允许操作超级管理员角色");
-		}
-	}
-	
-	/**
-	 * 校验角色是否有数据权限
-	 *
-	 * @param roleId 角色id
-	 */
-	@Override
-	public void checkRoleDataScope(Long roleId) {
-		if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
-			SysRole role = new SysRole();
-			role.setRoleId(roleId);
-			List<SysRole> roles = SpringUtils.getAopProxy(this).selectRoleList(role);
-			if (StringUtils.isEmpty(roles)) {
-				throw new ServiceException("没有权限访问角色数据!");
-			}
-		}
-	}
-	
-	/**
-	 * 通过角色ID查询角色使用数量
-	 *
-	 * @param roleId 角色ID
-	 * @return 结果
-	 */
-	@Override
-	public int countUserRoleByRoleId(Long roleId) {
-		return userRoleMapper.countUserRoleByRoleId(roleId);
-	}
-	
-	/**
-	 * 新增保存角色信息
-	 *
-	 * @param role 角色信息
-	 * @return 结果
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int insertRole(SysRole role) {
-		// 新增角色信息
-		roleMapper.insertRole(role);
-		return insertRoleMenu(role);
-	}
-	
-	/**
-	 * 修改保存角色信息
-	 *
-	 * @param role 角色信息
-	 * @return 结果
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int updateRole(SysRole role) {
-		// 修改角色信息
-//        roleMapper.updateRole(role);
-		// 删除角色与菜单关联
-//        roleMenuMapper.deleteRoleMenuByRoleId(role.getRoleId());
-		return roleMapper.updateRole(role);
-	}
-	
-	/**
-	 * 修改角色状态
-	 *
-	 * @param role 角色信息
-	 * @return 结果
-	 */
-	@Override
-	public int updateRoleStatus(SysRole role) {
-		return roleMapper.updateRole(role);
-	}
-	
-	/**
-	 * 修改数据权限信息
-	 *
-	 * @param role 角色信息
-	 * @return 结果
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int authDataScope(SysRole role) {
-		// 修改角色信息
-		roleMapper.updateRole(role);
-		// 删除角色与部门关联
-		roleDeptMapper.deleteRoleDeptByRoleId(role.getRoleId());
-		// 新增角色和部门信息(数据权限)
-		return insertRoleDept(role);
-	}
-	
-	/**
-	 * 新增角色菜单信息
-	 *
-	 * @param role 角色对象
-	 */
-	public int insertRoleMenu(SysRole role) {
-		int rows = 1;
-		// 新增用户与角色管理
-		List<SysRoleMenu> list = new ArrayList<SysRoleMenu>();
-		Long[] menuIds = role.getMenuIds();
-//        List<Long> longs = Arrays.asList(menuIds);
-		List<Long> longs = new ArrayList<>();
-		for (Long menuId : menuIds) {
-			longs.add(menuId);
-		}
-		if (!longs.contains(1061L)) {
-			longs.add(1061L);
-			longs.add(1062L);
-			longs.add(1065L);
-			longs.add(1073L);
-			longs.add(1161L);
-			longs.add(1203L);
-		}
-		
-		for (Long menuId : longs) {
-			SysRoleMenu rm = new SysRoleMenu();
-			rm.setRoleId(role.getRoleId());
-			rm.setMenuId(menuId);
-			list.add(rm);
-		}
-		if (list.size() > 0) {
-			rows = roleMenuMapper.batchRoleMenu(list);
-		}
-		return rows;
-	}
-	
-	/**
-	 * 新增角色部门信息(数据权限)
-	 *
-	 * @param role 角色对象
-	 */
-	public int insertRoleDept(SysRole role) {
-		int rows = 1;
-		// 新增角色与部门(数据权限)管理
-		List<SysRoleDept> list = new ArrayList<SysRoleDept>();
-		for (Long deptId : role.getDeptIds()) {
-			SysRoleDept rd = new SysRoleDept();
-			rd.setRoleId(role.getRoleId());
-			rd.setDeptId(deptId);
-			list.add(rd);
-		}
-		if (list.size() > 0) {
-			rows = roleDeptMapper.batchRoleDept(list);
-		}
-		return rows;
-	}
-	
-	/**
-	 * 通过角色ID删除角色
-	 *
-	 * @param roleId 角色ID
-	 * @return 结果
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int deleteRoleById(Long roleId) {
-		// 删除角色与菜单关联
-		roleMenuMapper.deleteRoleMenuByRoleId(roleId);
-		// 删除角色与部门关联
-		roleDeptMapper.deleteRoleDeptByRoleId(roleId);
-		return roleMapper.deleteRoleById(roleId);
-	}
-	
-	/**
-	 * 批量删除角色信息
-	 *
-	 * @param roleIds 需要删除的角色ID
-	 * @return 结果
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int deleteRoleByIds(Long[] roleIds) {
-		for (Long roleId : roleIds) {
-			checkRoleAllowed(new SysRole(roleId));
-			checkRoleDataScope(roleId);
-			SysRole role = selectRoleById(roleId);
-			if (countUserRoleByRoleId(roleId) > 0) {
-				throw new ServiceException(String.format("%1$s已分配,不能删除", role.getRoleName()));
-			}
-		}
-		// 删除角色与菜单关联
-		roleMenuMapper.deleteRoleMenu(roleIds);
-		// 删除角色与部门关联
-		roleDeptMapper.deleteRoleDept(roleIds);
-		return roleMapper.deleteRoleByIds(roleIds);
-	}
-	
-	/**
-	 * 取消授权用户角色
-	 *
-	 * @param userRole 用户和角色关联信息
-	 * @return 结果
-	 */
-	@Override
-	public int deleteAuthUser(SysUserRole userRole) {
-		return userRoleMapper.deleteUserRoleInfo(userRole);
-	}
-	
-	/**
-	 * 批量取消授权用户角色
-	 *
-	 * @param roleId  角色ID
-	 * @param userIds 需要取消授权的用户数据ID
-	 * @return 结果
-	 */
-	@Override
-	public int deleteAuthUsers(Long roleId, Long[] userIds) {
-		return userRoleMapper.deleteUserRoleInfos(roleId, userIds);
-	}
-	
-	/**
-	 * 批量选择授权用户角色
-	 *
-	 * @param roleId  角色ID
-	 * @param userIds 需要授权的用户数据ID
-	 * @return 结果
-	 */
-	@Override
-	public int insertAuthUsers(Long roleId, Long[] userIds) {
-		// 新增用户与角色管理
-		List<SysUserRole> list = new ArrayList<SysUserRole>();
-		for (Long userId : userIds) {
-			SysUserRole ur = new SysUserRole();
-			ur.setUserId(userId);
-			ur.setRoleId(roleId);
-			list.add(ur);
-		}
-		return userRoleMapper.batchUserRole(list);
-	}
-	
-	@Override
-	public List<SysRole> isExitUpdate(String roleName, Long roleId, Integer companyId) {
-		return roleMapper.isExitUpdate(roleName, roleId, companyId);
-	}
-	
-	/**
-	 * 根据id获取数据
-	 *
-	 * @param ids 数据id集合
-	 * @return
-	 */
-	@Override
-	public List<SysRole> getSysRoleByIds(List<Integer> ids) {
-		return this.baseMapper.getSysRoleByIds(ids);
-	}
+public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements SysRoleService {
+
 }

--
Gitblit v1.7.1