From 5ca038d888922e93bf45c7bd37f3c6dce849dcff Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 24 十二月 2021 11:36:02 +0800
Subject: [PATCH] update 调整监控依赖 从 common 迁移到 framework
---
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java | 83 +++++++++++++++++++++++++++++++----------
1 files changed, 63 insertions(+), 20 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
index 00c7d5f..37f0071 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
@@ -1,8 +1,10 @@
package com.ruoyi.system.service;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysRole;
-import com.ruoyi.common.core.page.IServicePlus;
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.system.domain.SysUserRole;
import java.util.List;
import java.util.Set;
@@ -10,12 +12,12 @@
/**
* 瑙掕壊涓氬姟灞�
*
- * @author ruoyi
+ * @author Lion Li
*/
-public interface ISysRoleService extends IServicePlus<SysRole> {
+public interface ISysRoleService extends IService<SysRole> {
- TableDataInfo<SysRole> selectPageRoleList(SysRole role);
+ TableDataInfo<SysRole> selectPageRoleList(SysRole role, PageQuery pageQuery);
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瑙掕壊鏁版嵁
@@ -23,22 +25,30 @@
* @param role 瑙掕壊淇℃伅
* @return 瑙掕壊鏁版嵁闆嗗悎淇℃伅
*/
- public List<SysRole> selectRoleList(SysRole role);
+ List<SysRole> selectRoleList(SysRole role);
/**
- * 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊
+ * 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊鍒楄〃
+ *
+ * @param userId 鐢ㄦ埛ID
+ * @return 瑙掕壊鍒楄〃
+ */
+ List<SysRole> selectRolesByUserId(Long userId);
+
+ /**
+ * 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊鏉冮檺
*
* @param userId 鐢ㄦ埛ID
* @return 鏉冮檺鍒楄〃
*/
- public Set<String> selectRolePermissionByUserId(Long userId);
+ Set<String> selectRolePermissionByUserId(Long userId);
/**
* 鏌ヨ鎵�鏈夎鑹�
*
* @return 瑙掕壊鍒楄〃
*/
- public List<SysRole> selectRoleAll();
+ List<SysRole> selectRoleAll();
/**
* 鏍规嵁鐢ㄦ埛ID鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�
@@ -46,7 +56,7 @@
* @param userId 鐢ㄦ埛ID
* @return 閫変腑瑙掕壊ID鍒楄〃
*/
- public List<Integer> selectRoleListByUserId(Long userId);
+ List<Long> selectRoleListByUserId(Long userId);
/**
* 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊
@@ -54,7 +64,7 @@
* @param roleId 瑙掕壊ID
* @return 瑙掕壊瀵硅薄淇℃伅
*/
- public SysRole selectRoleById(Long roleId);
+ SysRole selectRoleById(Long roleId);
/**
* 鏍￠獙瑙掕壊鍚嶇О鏄惁鍞竴
@@ -62,7 +72,7 @@
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
- public String checkRoleNameUnique(SysRole role);
+ String checkRoleNameUnique(SysRole role);
/**
* 鏍￠獙瑙掕壊鏉冮檺鏄惁鍞竴
@@ -70,14 +80,21 @@
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
- public String checkRoleKeyUnique(SysRole role);
+ String checkRoleKeyUnique(SysRole role);
/**
* 鏍￠獙瑙掕壊鏄惁鍏佽鎿嶄綔
*
* @param role 瑙掕壊淇℃伅
*/
- public void checkRoleAllowed(SysRole role);
+ void checkRoleAllowed(SysRole role);
+
+ /**
+ * 鏍￠獙瑙掕壊鏄惁鏈夋暟鎹潈闄�
+ *
+ * @param roleId 瑙掕壊id
+ */
+ void checkRoleDataScope(Long roleId);
/**
* 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊浣跨敤鏁伴噺
@@ -85,7 +102,7 @@
* @param roleId 瑙掕壊ID
* @return 缁撴灉
*/
- public int countUserRoleByRoleId(Long roleId);
+ long countUserRoleByRoleId(Long roleId);
/**
* 鏂板淇濆瓨瑙掕壊淇℃伅
@@ -93,7 +110,7 @@
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
- public int insertRole(SysRole role);
+ int insertRole(SysRole role);
/**
* 淇敼淇濆瓨瑙掕壊淇℃伅
@@ -101,7 +118,7 @@
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
- public int updateRole(SysRole role);
+ int updateRole(SysRole role);
/**
* 淇敼瑙掕壊鐘舵��
@@ -109,7 +126,7 @@
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
- public int updateRoleStatus(SysRole role);
+ int updateRoleStatus(SysRole role);
/**
* 淇敼鏁版嵁鏉冮檺淇℃伅
@@ -117,7 +134,7 @@
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
- public int authDataScope(SysRole role);
+ int authDataScope(SysRole role);
/**
* 閫氳繃瑙掕壊ID鍒犻櫎瑙掕壊
@@ -125,7 +142,7 @@
* @param roleId 瑙掕壊ID
* @return 缁撴灉
*/
- public int deleteRoleById(Long roleId);
+ int deleteRoleById(Long roleId);
/**
* 鎵归噺鍒犻櫎瑙掕壊淇℃伅
@@ -133,5 +150,31 @@
* @param roleIds 闇�瑕佸垹闄ょ殑瑙掕壊ID
* @return 缁撴灉
*/
- public int deleteRoleByIds(Long[] roleIds);
+ int deleteRoleByIds(Long[] roleIds);
+
+ /**
+ * 鍙栨秷鎺堟潈鐢ㄦ埛瑙掕壊
+ *
+ * @param userRole 鐢ㄦ埛鍜岃鑹插叧鑱斾俊鎭�
+ * @return 缁撴灉
+ */
+ int deleteAuthUser(SysUserRole userRole);
+
+ /**
+ * 鎵归噺鍙栨秷鎺堟潈鐢ㄦ埛瑙掕壊
+ *
+ * @param roleId 瑙掕壊ID
+ * @param userIds 闇�瑕佸彇娑堟巿鏉冪殑鐢ㄦ埛鏁版嵁ID
+ * @return 缁撴灉
+ */
+ int deleteAuthUsers(Long roleId, Long[] userIds);
+
+ /**
+ * 鎵归噺閫夋嫨鎺堟潈鐢ㄦ埛瑙掕壊
+ *
+ * @param roleId 瑙掕壊ID
+ * @param userIds 闇�瑕佸垹闄ょ殑鐢ㄦ埛鏁版嵁ID
+ * @return 缁撴灉
+ */
+ int insertAuthUsers(Long roleId, Long[] userIds);
}
--
Gitblit v1.9.3