From c82afc8c461956e45be0aa29ca2a7fe3f18ee6f7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 28 十二月 2021 11:23:33 +0800
Subject: [PATCH] update RedisUtils 迁移到 utils/redis 包下
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 80 +++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 41 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 db1e470..514afb1 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,14 +1,14 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ruoyi.common.annotation.DataScope;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
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;
@@ -29,7 +29,7 @@
/**
* 瑙掕壊 涓氬姟灞傚鐞�
*
- * @author ruoyi
+ * @author Lion Li
*/
@Service
public class SysRoleServiceImpl extends ServicePlusImpl<SysRoleMapper, SysRole, SysRole> implements ISysRoleService {
@@ -44,9 +44,9 @@
private SysRoleDeptMapper roleDeptMapper;
@Override
- @DataScope(deptAlias = "d")
- public TableDataInfo<SysRole> selectPageRoleList(SysRole role) {
- return PageUtils.buildDataInfo(baseMapper.selectPageRoleList(PageUtils.buildPage(), role));
+ public TableDataInfo<SysRole> selectPageRoleList(SysRole role, PageQuery pageQuery) {
+ Page<SysRole> page = baseMapper.selectPageRoleList(pageQuery.build(), role);
+ return TableDataInfo.build(page);
}
/**
@@ -56,7 +56,6 @@
* @return 瑙掕壊鏁版嵁闆嗗悎淇℃伅
*/
@Override
- @DataScope(deptAlias = "d")
public List<SysRole> selectRoleList(SysRole role) {
return baseMapper.selectRoleList(role);
}
@@ -117,7 +116,7 @@
* @return 閫変腑瑙掕壊ID鍒楄〃
*/
@Override
- public List<Integer> selectRoleListByUserId(Long userId) {
+ public List<Long> selectRoleListByUserId(Long userId) {
return baseMapper.selectRoleListByUserId(userId);
}
@@ -141,9 +140,10 @@
@Override
public String checkRoleNameUnique(SysRole role) {
Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
- SysRole info = getOne(new LambdaQueryWrapper<SysRole>()
- .eq(SysRole::getRoleName, role.getRoleName()).last("limit 1"));
- if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) {
+ long count = count(new LambdaQueryWrapper<SysRole>()
+ .eq(SysRole::getRoleName, role.getRoleName())
+ .ne(SysRole::getRoleId, roleId));
+ if (count > 0) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -158,9 +158,10 @@
@Override
public String checkRoleKeyUnique(SysRole role) {
Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId();
- SysRole info = getOne(new LambdaQueryWrapper<SysRole>()
- .eq(SysRole::getRoleKey, role.getRoleKey()).last("limit 1"));
- if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) {
+ long count = count(new LambdaQueryWrapper<SysRole>()
+ .eq(SysRole::getRoleKey, role.getRoleKey())
+ .ne(SysRole::getRoleId, roleId));
+ if (count > 0) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -184,15 +185,12 @@
* @param roleId 瑙掕壊id
*/
@Override
- public void checkRoleDataScope(Long roleId)
- {
- if (!SysUser.isAdmin(SecurityUtils.getUserId()))
- {
+ 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))
- {
+ if (StringUtils.isEmpty(roles)) {
throw new ServiceException("娌℃湁鏉冮檺璁块棶瑙掕壊鏁版嵁锛�");
}
}
@@ -205,7 +203,7 @@
* @return 缁撴灉
*/
@Override
- public int countUserRoleByRoleId(Long roleId) {
+ public long countUserRoleByRoleId(Long roleId) {
return userRoleMapper.selectCount(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getRoleId, roleId));
}
@@ -216,7 +214,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public int insertRole(SysRole role) {
// 鏂板瑙掕壊淇℃伅
baseMapper.insert(role);
@@ -230,7 +228,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public int updateRole(SysRole role) {
// 淇敼瑙掕壊淇℃伅
baseMapper.updateById(role);
@@ -257,7 +255,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public int authDataScope(SysRole role) {
// 淇敼瑙掕壊淇℃伅
baseMapper.updateById(role);
@@ -283,7 +281,7 @@
list.add(rm);
}
if (list.size() > 0) {
- rows = roleMenuMapper.insertAll(list);
+ rows = roleMenuMapper.insertAll(list);
}
return rows;
}
@@ -304,7 +302,7 @@
list.add(rd);
}
if (list.size() > 0) {
- rows = roleDeptMapper.insertAll(list);
+ rows = roleDeptMapper.insertAll(list);
}
return rows;
}
@@ -316,7 +314,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public int deleteRoleById(Long roleId) {
// 鍒犻櫎瑙掕壊涓庤彍鍗曞叧鑱�
roleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, roleId));
@@ -332,7 +330,7 @@
* @return 缁撴灉
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public int deleteRoleByIds(Long[] roleIds) {
for (Long roleId : roleIds) {
checkRoleAllowed(new SysRole(roleId));
@@ -358,45 +356,45 @@
@Override
public int deleteAuthUser(SysUserRole userRole) {
return userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>()
- .eq(SysUserRole::getRoleId, userRole.getRoleId())
- .eq(SysUserRole::getUserId, userRole.getUserId()));
+ .eq(SysUserRole::getRoleId, userRole.getRoleId())
+ .eq(SysUserRole::getUserId, userRole.getUserId()));
}
/**
* 鎵归噺鍙栨秷鎺堟潈鐢ㄦ埛瑙掕壊
*
- * @param roleId 瑙掕壊ID
+ * @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)));
+ return userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>()
+ .eq(SysUserRole::getRoleId, roleId)
+ .in(SysUserRole::getUserId, Arrays.asList(userIds)));
}
/**
* 鎵归噺閫夋嫨鎺堟潈鐢ㄦ埛瑙掕壊
*
- * @param roleId 瑙掕壊ID
+ * @param roleId 瑙掕壊ID
* @param userIds 闇�瑕佸垹闄ょ殑鐢ㄦ埛鏁版嵁ID
* @return 缁撴灉
*/
@Override
public int insertAuthUsers(Long roleId, Long[] userIds) {
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
- int rows = 1;
- List<SysUserRole> list = new ArrayList<SysUserRole>();
+ 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);
- }
+ if (list.size() > 0) {
+ rows = userRoleMapper.insertAll(list);
+ }
return rows;
}
}
--
Gitblit v1.9.3