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/ISysRoleService.java | 310 +++++++++++++++++++++++++++++---------------------
1 files changed, 179 insertions(+), 131 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 4a4bee2..2cde2ae 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,131 +1,179 @@
-package com.ruoyi.system.service;
-
-import java.util.List;
-import java.util.Set;
-import com.ruoyi.common.core.domain.entity.SysRole;
-
-/**
- * 瑙掕壊涓氬姟灞�
- *
- * @author ruoyi
- */
-public interface ISysRoleService
-{
- /**
- * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瑙掕壊鏁版嵁
- *
- * @param role 瑙掕壊淇℃伅
- * @return 瑙掕壊鏁版嵁闆嗗悎淇℃伅
- */
- public List<SysRole> selectRoleList(SysRole role);
-
- /**
- * 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊
- *
- * @param userId 鐢ㄦ埛ID
- * @return 鏉冮檺鍒楄〃
- */
- public Set<String> selectRolePermissionByUserId(Long userId);
-
- /**
- * 鏌ヨ鎵�鏈夎鑹�
- *
- * @return 瑙掕壊鍒楄〃
- */
- public List<SysRole> selectRoleAll();
-
- /**
- * 鏍规嵁鐢ㄦ埛ID鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�
- *
- * @param userId 鐢ㄦ埛ID
- * @return 閫変腑瑙掕壊ID鍒楄〃
- */
- public List<Integer> selectRoleListByUserId(Long userId);
-
- /**
- * 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊
- *
- * @param roleId 瑙掕壊ID
- * @return 瑙掕壊瀵硅薄淇℃伅
- */
- public SysRole selectRoleById(Long roleId);
-
- /**
- * 鏍￠獙瑙掕壊鍚嶇О鏄惁鍞竴
- *
- * @param role 瑙掕壊淇℃伅
- * @return 缁撴灉
- */
- public String checkRoleNameUnique(SysRole role);
-
- /**
- * 鏍￠獙瑙掕壊鏉冮檺鏄惁鍞竴
- *
- * @param role 瑙掕壊淇℃伅
- * @return 缁撴灉
- */
- public String checkRoleKeyUnique(SysRole role);
-
- /**
- * 鏍￠獙瑙掕壊鏄惁鍏佽鎿嶄綔
- *
- * @param role 瑙掕壊淇℃伅
- */
- public void checkRoleAllowed(SysRole role);
-
- /**
- * 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊浣跨敤鏁伴噺
- *
- * @param roleId 瑙掕壊ID
- * @return 缁撴灉
- */
- public int countUserRoleByRoleId(Long roleId);
-
- /**
- * 鏂板淇濆瓨瑙掕壊淇℃伅
- *
- * @param role 瑙掕壊淇℃伅
- * @return 缁撴灉
- */
- public int insertRole(SysRole role);
-
- /**
- * 淇敼淇濆瓨瑙掕壊淇℃伅
- *
- * @param role 瑙掕壊淇℃伅
- * @return 缁撴灉
- */
- public int updateRole(SysRole role);
-
- /**
- * 淇敼瑙掕壊鐘舵��
- *
- * @param role 瑙掕壊淇℃伅
- * @return 缁撴灉
- */
- public int updateRoleStatus(SysRole role);
-
- /**
- * 淇敼鏁版嵁鏉冮檺淇℃伅
- *
- * @param role 瑙掕壊淇℃伅
- * @return 缁撴灉
- */
- public int authDataScope(SysRole role);
-
- /**
- * 閫氳繃瑙掕壊ID鍒犻櫎瑙掕壊
- *
- * @param roleId 瑙掕壊ID
- * @return 缁撴灉
- */
- public int deleteRoleById(Long roleId);
-
- /**
- * 鎵归噺鍒犻櫎瑙掕壊淇℃伅
- *
- * @param roleIds 闇�瑕佸垹闄ょ殑瑙掕壊ID
- * @return 缁撴灉
- */
- public int deleteRoleByIds(Long[] roleIds);
-}
+package com.ruoyi.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.system.domain.SysUserRole;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 瑙掕壊涓氬姟灞�
+ *
+ * @author ruoyi
+ */
+public interface ISysRoleService extends IService<SysRole> {
+
+
+ TableDataInfo<SysRole> selectPageRoleList(SysRole role);
+
+ /**
+ * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瑙掕壊鏁版嵁
+ *
+ * @param role 瑙掕壊淇℃伅
+ * @return 瑙掕壊鏁版嵁闆嗗悎淇℃伅
+ */
+ public List<SysRole> selectRoleList(SysRole role);
+
+ /**
+ * 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊鍒楄〃
+ *
+ * @param userId 鐢ㄦ埛ID
+ * @return 瑙掕壊鍒楄〃
+ */
+ public List<SysRole> selectRolesByUserId(Long userId);
+
+ /**
+ * 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊鏉冮檺
+ *
+ * @param userId 鐢ㄦ埛ID
+ * @return 鏉冮檺鍒楄〃
+ */
+ public Set<String> selectRolePermissionByUserId(Long userId);
+
+ /**
+ * 鏌ヨ鎵�鏈夎鑹�
+ *
+ * @return 瑙掕壊鍒楄〃
+ */
+ public List<SysRole> selectRoleAll();
+
+ /**
+ * 鏍规嵁鐢ㄦ埛ID鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�
+ *
+ * @param userId 鐢ㄦ埛ID
+ * @return 閫変腑瑙掕壊ID鍒楄〃
+ */
+ public List<Integer> selectRoleListByUserId(Long userId);
+
+ /**
+ * 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊
+ *
+ * @param roleId 瑙掕壊ID
+ * @return 瑙掕壊瀵硅薄淇℃伅
+ */
+ public SysRole selectRoleById(Long roleId);
+
+ /**
+ * 鏍￠獙瑙掕壊鍚嶇О鏄惁鍞竴
+ *
+ * @param role 瑙掕壊淇℃伅
+ * @return 缁撴灉
+ */
+ public String checkRoleNameUnique(SysRole role);
+
+ /**
+ * 鏍￠獙瑙掕壊鏉冮檺鏄惁鍞竴
+ *
+ * @param role 瑙掕壊淇℃伅
+ * @return 缁撴灉
+ */
+ public String checkRoleKeyUnique(SysRole role);
+
+ /**
+ * 鏍￠獙瑙掕壊鏄惁鍏佽鎿嶄綔
+ *
+ * @param role 瑙掕壊淇℃伅
+ */
+ public void checkRoleAllowed(SysRole role);
+
+ /**
+ * 鏍￠獙瑙掕壊鏄惁鏈夋暟鎹潈闄�
+ *
+ * @param roleId 瑙掕壊id
+ */
+ public void checkRoleDataScope(Long roleId);
+
+ /**
+ * 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊浣跨敤鏁伴噺
+ *
+ * @param roleId 瑙掕壊ID
+ * @return 缁撴灉
+ */
+ public int countUserRoleByRoleId(Long roleId);
+
+ /**
+ * 鏂板淇濆瓨瑙掕壊淇℃伅
+ *
+ * @param role 瑙掕壊淇℃伅
+ * @return 缁撴灉
+ */
+ public int insertRole(SysRole role);
+
+ /**
+ * 淇敼淇濆瓨瑙掕壊淇℃伅
+ *
+ * @param role 瑙掕壊淇℃伅
+ * @return 缁撴灉
+ */
+ public int updateRole(SysRole role);
+
+ /**
+ * 淇敼瑙掕壊鐘舵��
+ *
+ * @param role 瑙掕壊淇℃伅
+ * @return 缁撴灉
+ */
+ public int updateRoleStatus(SysRole role);
+
+ /**
+ * 淇敼鏁版嵁鏉冮檺淇℃伅
+ *
+ * @param role 瑙掕壊淇℃伅
+ * @return 缁撴灉
+ */
+ public int authDataScope(SysRole role);
+
+ /**
+ * 閫氳繃瑙掕壊ID鍒犻櫎瑙掕壊
+ *
+ * @param roleId 瑙掕壊ID
+ * @return 缁撴灉
+ */
+ public int deleteRoleById(Long roleId);
+
+ /**
+ * 鎵归噺鍒犻櫎瑙掕壊淇℃伅
+ *
+ * @param roleIds 闇�瑕佸垹闄ょ殑瑙掕壊ID
+ * @return 缁撴灉
+ */
+ public int deleteRoleByIds(Long[] roleIds);
+
+ /**
+ * 鍙栨秷鎺堟潈鐢ㄦ埛瑙掕壊
+ *
+ * @param userRole 鐢ㄦ埛鍜岃鑹插叧鑱斾俊鎭�
+ * @return 缁撴灉
+ */
+ public int deleteAuthUser(SysUserRole userRole);
+
+ /**
+ * 鎵归噺鍙栨秷鎺堟潈鐢ㄦ埛瑙掕壊
+ *
+ * @param roleId 瑙掕壊ID
+ * @param userIds 闇�瑕佸彇娑堟巿鏉冪殑鐢ㄦ埛鏁版嵁ID
+ * @return 缁撴灉
+ */
+ public int deleteAuthUsers(Long roleId, Long[] userIds);
+
+ /**
+ * 鎵归噺閫夋嫨鎺堟潈鐢ㄦ埛瑙掕壊
+ *
+ * @param roleId 瑙掕壊ID
+ * @param userIds 闇�瑕佸垹闄ょ殑鐢ㄦ埛鏁版嵁ID
+ * @return 缁撴灉
+ */
+ public int insertAuthUsers(Long roleId, Long[] userIds);
+}
--
Gitblit v1.9.3