From b38151a0bb0484221ba7b9ad3a1aa773105e1b14 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 06 十二月 2022 11:32:35 +0800
Subject: [PATCH] !260 单元格合并判断cellValue是否相等方法调整 Merge pull request !260 from zendwang/dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 340 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 217 insertions(+), 123 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 ad91b71..e7e5b53 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,75 +1,111 @@
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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import com.ruoyi.common.annotation.DataScope;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.exception.CustomException;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.helper.LoginHelper;
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 lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
/**
* 瑙掕壊 涓氬姟灞傚鐞�
- *
- * @author ruoyi
+ *
+ * @author Lion Li
*/
+@RequiredArgsConstructor
@Service
-public class SysRoleServiceImpl implements ISysRoleService
-{
- @Autowired
- private SysRoleMapper roleMapper;
+public class SysRoleServiceImpl implements ISysRoleService {
- @Autowired
- private SysRoleMenuMapper roleMenuMapper;
+ private final SysRoleMapper baseMapper;
+ private final SysRoleMenuMapper roleMenuMapper;
+ private final SysUserRoleMapper userRoleMapper;
+ private final SysRoleDeptMapper roleDeptMapper;
- @Autowired
- private SysUserRoleMapper userRoleMapper;
-
- @Autowired
- private SysRoleDeptMapper roleDeptMapper;
+ @Override
+ public TableDataInfo<SysRole> selectPageRoleList(SysRole role, PageQuery pageQuery) {
+ Page<SysRole> page = baseMapper.selectPageRoleList(pageQuery.build(), this.buildQueryWrapper(role));
+ return TableDataInfo.build(page);
+ }
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瑙掕壊鏁版嵁
- *
+ *
* @param role 瑙掕壊淇℃伅
* @return 瑙掕壊鏁版嵁闆嗗悎淇℃伅
*/
@Override
- @DataScope(deptAlias = "d")
- public List<SysRole> selectRoleList(SysRole role)
- {
- return roleMapper.selectRoleList(role);
+ public List<SysRole> selectRoleList(SysRole role) {
+ return baseMapper.selectRoleList(this.buildQueryWrapper(role));
+ }
+
+ private Wrapper<SysRole> buildQueryWrapper(SysRole role) {
+ Map<String, Object> params = role.getParams();
+ QueryWrapper<SysRole> wrapper = Wrappers.query();
+ wrapper.eq("r.del_flag", UserConstants.ROLE_NORMAL)
+ .eq(ObjectUtil.isNotNull(role.getRoleId()), "r.role_id", role.getRoleId())
+ .like(StringUtils.isNotBlank(role.getRoleName()), "r.role_name", role.getRoleName())
+ .eq(StringUtils.isNotBlank(role.getStatus()), "r.status", role.getStatus())
+ .like(StringUtils.isNotBlank(role.getRoleKey()), "r.role_key", role.getRoleKey())
+ .between(params.get("beginTime") != null && params.get("endTime") != null,
+ "r.create_time", params.get("beginTime"), params.get("endTime"))
+ .orderByAsc("r.role_sort");
+ return wrapper;
+ }
+
+ /**
+ * 鏍规嵁鐢ㄦ埛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;
}
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺
- *
+ *
* @param userId 鐢ㄦ埛ID
* @return 鏉冮檺鍒楄〃
*/
@Override
- public Set<String> selectRolePermissionByUserId(Long userId)
- {
- List<SysRole> perms = roleMapper.selectRolePermissionByUserId(userId);
+ public Set<String> selectRolePermissionByUserId(Long userId) {
+ List<SysRole> perms = baseMapper.selectRolePermissionByUserId(userId);
Set<String> permsSet = new HashSet<>();
- for (SysRole perm : perms)
- {
- if (StringUtils.isNotNull(perm))
- {
+ for (SysRole perm : perms) {
+ if (ObjectUtil.isNotNull(perm)) {
permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(",")));
}
}
@@ -78,52 +114,48 @@
/**
* 鏌ヨ鎵�鏈夎鑹�
- *
+ *
* @return 瑙掕壊鍒楄〃
*/
@Override
- public List<SysRole> selectRoleAll()
- {
- return SpringUtils.getAopProxy(this).selectRoleList(new SysRole());
+ public List<SysRole> selectRoleAll() {
+ return this.selectRoleList(new SysRole());
}
/**
* 鏍规嵁鐢ㄦ埛ID鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�
- *
+ *
* @param userId 鐢ㄦ埛ID
* @return 閫変腑瑙掕壊ID鍒楄〃
*/
@Override
- public List<Integer> selectRoleListByUserId(Long userId)
- {
- return roleMapper.selectRoleListByUserId(userId);
+ public List<Long> selectRoleListByUserId(Long userId) {
+ return baseMapper.selectRoleListByUserId(userId);
}
/**
* 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊
- *
+ *
* @param roleId 瑙掕壊ID
* @return 瑙掕壊瀵硅薄淇℃伅
*/
@Override
- public SysRole selectRoleById(Long roleId)
- {
- return roleMapper.selectRoleById(roleId);
+ public SysRole selectRoleById(Long roleId) {
+ return baseMapper.selectById(roleId);
}
/**
* 鏍￠獙瑙掕壊鍚嶇О鏄惁鍞竴
- *
+ *
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
@Override
- public String 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())
- {
+ public String checkRoleNameUnique(SysRole role) {
+ boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysRole>()
+ .eq(SysRole::getRoleName, role.getRoleName())
+ .ne(ObjectUtil.isNotNull(role.getRoleId()), SysRole::getRoleId, role.getRoleId()));
+ if (exist) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -131,17 +163,16 @@
/**
* 鏍￠獙瑙掕壊鏉冮檺鏄惁鍞竴
- *
+ *
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
@Override
- public String 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())
- {
+ public String checkRoleKeyUnique(SysRole role) {
+ boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysRole>()
+ .eq(SysRole::getRoleKey, role.getRoleKey())
+ .ne(ObjectUtil.isNotNull(role.getRoleId()), SysRole::getRoleId, role.getRoleId()));
+ if (exist) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -149,112 +180,119 @@
/**
* 鏍￠獙瑙掕壊鏄惁鍏佽鎿嶄綔
- *
+ *
* @param role 瑙掕壊淇℃伅
*/
@Override
- public void checkRoleAllowed(SysRole role)
- {
- if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin())
- {
- throw new CustomException("涓嶅厑璁告搷浣滆秴绾х鐞嗗憳瑙掕壊");
+ public void checkRoleAllowed(SysRole role) {
+ if (ObjectUtil.isNotNull(role.getRoleId()) && role.isAdmin()) {
+ throw new ServiceException("涓嶅厑璁告搷浣滆秴绾х鐞嗗憳瑙掕壊");
+ }
+ }
+
+ /**
+ * 鏍￠獙瑙掕壊鏄惁鏈夋暟鎹潈闄�
+ *
+ * @param roleId 瑙掕壊id
+ */
+ @Override
+ public void checkRoleDataScope(Long roleId) {
+ if (!LoginHelper.isAdmin()) {
+ SysRole role = new SysRole();
+ role.setRoleId(roleId);
+ List<SysRole> roles = this.selectRoleList(role);
+ if (CollUtil.isEmpty(roles)) {
+ throw new ServiceException("娌℃湁鏉冮檺璁块棶瑙掕壊鏁版嵁锛�");
+ }
}
}
/**
* 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊浣跨敤鏁伴噺
- *
+ *
* @param roleId 瑙掕壊ID
* @return 缁撴灉
*/
@Override
- public int countUserRoleByRoleId(Long roleId)
- {
- return userRoleMapper.countUserRoleByRoleId(roleId);
+ public long countUserRoleByRoleId(Long roleId) {
+ return userRoleMapper.selectCount(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getRoleId, roleId));
}
/**
* 鏂板淇濆瓨瑙掕壊淇℃伅
- *
+ *
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
@Override
- @Transactional
- public int insertRole(SysRole role)
- {
+ @Transactional(rollbackFor = Exception.class)
+ public int insertRole(SysRole role) {
// 鏂板瑙掕壊淇℃伅
- roleMapper.insertRole(role);
+ baseMapper.insert(role);
return insertRoleMenu(role);
}
/**
* 淇敼淇濆瓨瑙掕壊淇℃伅
- *
+ *
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
@Override
- @Transactional
- public int updateRole(SysRole role)
- {
+ @Transactional(rollbackFor = Exception.class)
+ public int updateRole(SysRole role) {
// 淇敼瑙掕壊淇℃伅
- roleMapper.updateRole(role);
+ baseMapper.updateById(role);
// 鍒犻櫎瑙掕壊涓庤彍鍗曞叧鑱�
- roleMenuMapper.deleteRoleMenuByRoleId(role.getRoleId());
+ roleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, role.getRoleId()));
return insertRoleMenu(role);
}
/**
* 淇敼瑙掕壊鐘舵��
- *
+ *
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
@Override
- public int updateRoleStatus(SysRole role)
- {
- return roleMapper.updateRole(role);
+ public int updateRoleStatus(SysRole role) {
+ return baseMapper.updateById(role);
}
/**
* 淇敼鏁版嵁鏉冮檺淇℃伅
- *
+ *
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
@Override
- @Transactional
- public int authDataScope(SysRole role)
- {
+ @Transactional(rollbackFor = Exception.class)
+ public int authDataScope(SysRole role) {
// 淇敼瑙掕壊淇℃伅
- roleMapper.updateRole(role);
+ baseMapper.updateById(role);
// 鍒犻櫎瑙掕壊涓庨儴闂ㄥ叧鑱�
- roleDeptMapper.deleteRoleDeptByRoleId(role.getRoleId());
+ roleDeptMapper.delete(new LambdaQueryWrapper<SysRoleDept>().eq(SysRoleDept::getRoleId, role.getRoleId()));
// 鏂板瑙掕壊鍜岄儴闂ㄤ俊鎭紙鏁版嵁鏉冮檺锛�
return insertRoleDept(role);
}
/**
* 鏂板瑙掕壊鑿滃崟淇℃伅
- *
+ *
* @param role 瑙掕壊瀵硅薄
*/
- public int insertRoleMenu(SysRole role)
- {
+ public int insertRoleMenu(SysRole role) {
int rows = 1;
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
List<SysRoleMenu> list = new ArrayList<SysRoleMenu>();
- for (Long menuId : role.getMenuIds())
- {
+ for (Long menuId : role.getMenuIds()) {
SysRoleMenu rm = new SysRoleMenu();
rm.setRoleId(role.getRoleId());
rm.setMenuId(menuId);
list.add(rm);
}
- if (list.size() > 0)
- {
- rows = roleMenuMapper.batchRoleMenu(list);
+ if (list.size() > 0) {
+ rows = roleMenuMapper.insertBatch(list) ? list.size() : 0;
}
return rows;
}
@@ -264,55 +302,111 @@
*
* @param role 瑙掕壊瀵硅薄
*/
- public int insertRoleDept(SysRole role)
- {
+ public int insertRoleDept(SysRole role) {
int rows = 1;
// 鏂板瑙掕壊涓庨儴闂紙鏁版嵁鏉冮檺锛夌鐞�
List<SysRoleDept> list = new ArrayList<SysRoleDept>();
- for (Long deptId : role.getDeptIds())
- {
+ 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);
+ if (list.size() > 0) {
+ rows = roleDeptMapper.insertBatch(list) ? list.size() : 0;
}
return rows;
}
/**
* 閫氳繃瑙掕壊ID鍒犻櫎瑙掕壊
- *
+ *
* @param roleId 瑙掕壊ID
* @return 缁撴灉
*/
@Override
- public int deleteRoleById(Long roleId)
- {
- return roleMapper.deleteRoleById(roleId);
+ @Transactional(rollbackFor = Exception.class)
+ public int deleteRoleById(Long roleId) {
+ // 鍒犻櫎瑙掕壊涓庤彍鍗曞叧鑱�
+ roleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, roleId));
+ // 鍒犻櫎瑙掕壊涓庨儴闂ㄥ叧鑱�
+ roleDeptMapper.delete(new LambdaQueryWrapper<SysRoleDept>().eq(SysRoleDept::getRoleId, roleId));
+ return baseMapper.deleteById(roleId);
}
/**
* 鎵归噺鍒犻櫎瑙掕壊淇℃伅
- *
+ *
* @param roleIds 闇�瑕佸垹闄ょ殑瑙掕壊ID
* @return 缁撴灉
*/
@Override
- public int deleteRoleByIds(Long[] roleIds)
- {
- for (Long roleId : roleIds)
- {
+ @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 CustomException(String.format("%1$s宸插垎閰�,涓嶈兘鍒犻櫎", role.getRoleName()));
+ if (countUserRoleByRoleId(roleId) > 0) {
+ throw new ServiceException(String.format("%1$s宸插垎閰�,涓嶈兘鍒犻櫎", role.getRoleName()));
}
}
- return roleMapper.deleteRoleByIds(roleIds);
+ List<Long> ids = Arrays.asList(roleIds);
+ // 鍒犻櫎瑙掕壊涓庤彍鍗曞叧鑱�
+ roleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().in(SysRoleMenu::getRoleId, ids));
+ // 鍒犻櫎瑙掕壊涓庨儴闂ㄥ叧鑱�
+ 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.insertBatch(list) ? list.size() : 0;
+ }
+ return rows;
}
}
--
Gitblit v1.9.3