From ab4b75fe30f9a3cf08e3ced667c3ec8c711ca939 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 06 九月 2021 09:59:28 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 151 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 116 insertions(+), 35 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
index d025dd4..ae4bc89 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -1,13 +1,16 @@
package com.ruoyi.system.service.impl;
-import cn.hutool.core.lang.Validator;
-import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysRole;
-import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.domain.SysRoleDept;
import com.ruoyi.system.domain.SysRoleMenu;
@@ -29,7 +32,7 @@
* @author ruoyi
*/
@Service
-public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
+public class SysRoleServiceImpl extends ServicePlusImpl<SysRoleMapper, SysRole, SysRole> implements ISysRoleService {
@Autowired
private SysRoleMenuMapper roleMenuMapper;
@@ -40,6 +43,12 @@
@Autowired
private SysRoleDeptMapper roleDeptMapper;
+ @Override
+ @DataScope(deptAlias = "d")
+ public TableDataInfo<SysRole> selectPageRoleList(SysRole role) {
+ return PageUtils.buildDataInfo(baseMapper.selectPageRoleList(PageUtils.buildPage(), role));
+ }
+
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瑙掕壊鏁版嵁
*
@@ -49,20 +58,28 @@
@Override
@DataScope(deptAlias = "d")
public List<SysRole> selectRoleList(SysRole role) {
- Map<String, Object> params = role.getParams();
- Object dataScope = params.get("dataScope");
- return list(new LambdaQueryWrapper<SysRole>()
- .like(StrUtil.isNotBlank(role.getRoleName()), SysRole::getRoleName, role.getRoleName())
- .eq(StrUtil.isNotBlank(role.getStatus()), SysRole::getStatus, role.getStatus())
- .like(StrUtil.isNotBlank(role.getRoleKey()), SysRole::getRoleKey, role.getRoleKey())
- .apply(Validator.isNotEmpty(params.get("beginTime")),
- "date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')",
- params.get("beginTime"))
- .apply(Validator.isNotEmpty(params.get("endTime")),
- "date_format(create_time,'%y%m%d') <= date_format({0},'%y%m%d')",
- params.get("endTime"))
- .apply(dataScope != null, dataScope != null ? dataScope.toString() : null)
- .orderByAsc(SysRole::getRoleSort));
+ return baseMapper.selectRoleList(role);
+ }
+
+ /**
+ * 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊
+ *
+ * @param userId 鐢ㄦ埛ID
+ * @return 瑙掕壊鍒楄〃
+ */
+ @Override
+ public List<SysRole> selectRolesByUserId(Long userId) {
+ List<SysRole> userRoles = baseMapper.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;
}
/**
@@ -76,7 +93,7 @@
List<SysRole> perms = baseMapper.selectRolePermissionByUserId(userId);
Set<String> permsSet = new HashSet<>();
for (SysRole perm : perms) {
- if (Validator.isNotNull(perm)) {
+ if (StringUtils.isNotNull(perm)) {
permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(",")));
}
}
@@ -123,10 +140,10 @@
*/
@Override
public String checkRoleNameUnique(SysRole role) {
- Long roleId = Validator.isNull(role.getRoleId()) ? -1L : role.getRoleId();
+ Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
SysRole info = getOne(new LambdaQueryWrapper<SysRole>()
.eq(SysRole::getRoleName, role.getRoleName()).last("limit 1"));
- if (Validator.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) {
+ if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -140,10 +157,10 @@
*/
@Override
public String checkRoleKeyUnique(SysRole role) {
- Long roleId = Validator.isNull(role.getRoleId()) ? -1L : role.getRoleId();
+ Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
SysRole info = getOne(new LambdaQueryWrapper<SysRole>()
.eq(SysRole::getRoleKey, role.getRoleKey()).last("limit 1"));
- if (Validator.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) {
+ if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -156,8 +173,25 @@
*/
@Override
public void checkRoleAllowed(SysRole role) {
- if (Validator.isNotNull(role.getRoleId()) && role.isAdmin()) {
- throw new CustomException("涓嶅厑璁告搷浣滆秴绾х鐞嗗憳瑙掕壊");
+ 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("娌℃湁鏉冮檺璁块棶瑙掕壊鏁版嵁锛�");
+ }
}
}
@@ -236,7 +270,7 @@
* @param role 瑙掕壊瀵硅薄
*/
public int insertRoleMenu(SysRole role) {
- int rows = 0;
+ int rows = 1;
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
List<SysRoleMenu> list = new ArrayList<SysRoleMenu>();
for (Long menuId : role.getMenuIds()) {
@@ -246,9 +280,7 @@
list.add(rm);
}
if (list.size() > 0) {
- for (SysRoleMenu sysRoleMenu : list) {
- rows += roleMenuMapper.insert(sysRoleMenu);
- }
+ rows = roleMenuMapper.insertAll(list);
}
return rows;
}
@@ -259,7 +291,7 @@
* @param role 瑙掕壊瀵硅薄
*/
public int insertRoleDept(SysRole role) {
- int rows = 0;
+ int rows = 1;
// 鏂板瑙掕壊涓庨儴闂紙鏁版嵁鏉冮檺锛夌鐞�
List<SysRoleDept> list = new ArrayList<SysRoleDept>();
for (Long deptId : role.getDeptIds()) {
@@ -269,9 +301,7 @@
list.add(rd);
}
if (list.size() > 0) {
- for (SysRoleDept sysRoleDept : list) {
- rows += roleDeptMapper.insert(sysRoleDept);
- }
+ rows = roleDeptMapper.insertAll(list);
}
return rows;
}
@@ -305,7 +335,7 @@
checkRoleAllowed(new SysRole(roleId));
SysRole role = selectRoleById(roleId);
if (countUserRoleByRoleId(roleId) > 0) {
- throw new CustomException(String.format("%1$s宸插垎閰�,涓嶈兘鍒犻櫎", role.getRoleName()));
+ throw new ServiceException(String.format("%1$s宸插垎閰�,涓嶈兘鍒犻櫎", role.getRoleName()));
}
}
List<Long> ids = Arrays.asList(roleIds);
@@ -315,4 +345,55 @@
roleDeptMapper.delete(new LambdaQueryWrapper<SysRoleDept>().in(SysRoleDept::getRoleId, ids));
return baseMapper.deleteBatchIds(ids);
}
+
+ /**
+ * 鍙栨秷鎺堟潈鐢ㄦ埛瑙掕壊
+ *
+ * @param userRole 鐢ㄦ埛鍜岃鑹插叧鑱斾俊鎭�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteAuthUser(SysUserRole userRole) {
+ return userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>()
+ .eq(SysUserRole::getRoleId, userRole.getRoleId())
+ .eq(SysUserRole::getUserId, userRole.getUserId()));
+ }
+
+ /**
+ * 鎵归噺鍙栨秷鎺堟潈鐢ㄦ埛瑙掕壊
+ *
+ * @param roleId 瑙掕壊ID
+ * @param userIds 闇�瑕佸彇娑堟巿鏉冪殑鐢ㄦ埛鏁版嵁ID
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteAuthUsers(Long roleId, Long[] userIds) {
+ return userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>()
+ .eq(SysUserRole::getRoleId, roleId)
+ .in(SysUserRole::getUserId, Arrays.asList(userIds)));
+ }
+
+ /**
+ * 鎵归噺閫夋嫨鎺堟潈鐢ㄦ埛瑙掕壊
+ *
+ * @param roleId 瑙掕壊ID
+ * @param userIds 闇�瑕佸垹闄ょ殑鐢ㄦ埛鏁版嵁ID
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertAuthUsers(Long roleId, Long[] userIds) {
+ // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
+ int rows = 1;
+ List<SysUserRole> list = new ArrayList<SysUserRole>();
+ for (Long userId : userIds) {
+ SysUserRole ur = new SysUserRole();
+ ur.setUserId(userId);
+ ur.setRoleId(roleId);
+ list.add(ur);
+ }
+ if (list.size() > 0) {
+ rows = userRoleMapper.insertAll(list);
+ }
+ return rows;
+ }
}
--
Gitblit v1.9.3