From af6a08398e2bc22f3c8a3a615cbd9e23190be906 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 12 五月 2022 10:55:44 +0800
Subject: [PATCH] update 优化 文件与图片上传组件 使用id存储回显

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java |   85 +++++++++++++++++++++++++++++++++---------
 1 files changed, 66 insertions(+), 19 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 48cb991..5b726b2 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,7 +1,9 @@
 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.TableDataInfo;
+import com.ruoyi.system.domain.SysUserRole;
 
 import java.util.List;
 import java.util.Set;
@@ -9,31 +11,43 @@
 /**
  * 瑙掕壊涓氬姟灞�
  *
- * @author ruoyi
+ * @author Lion Li
  */
-public interface ISysRoleService extends IService<SysRole> {
+public interface ISysRoleService {
+
+
+    TableDataInfo<SysRole> selectPageRoleList(SysRole role, PageQuery pageQuery);
+
     /**
      * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瑙掕壊鏁版嵁
      *
      * @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鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�
@@ -41,7 +55,7 @@
      * @param userId 鐢ㄦ埛ID
      * @return 閫変腑瑙掕壊ID鍒楄〃
      */
-    public List<Integer> selectRoleListByUserId(Long userId);
+    List<Long> selectRoleListByUserId(Long userId);
 
     /**
      * 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊
@@ -49,7 +63,7 @@
      * @param roleId 瑙掕壊ID
      * @return 瑙掕壊瀵硅薄淇℃伅
      */
-    public SysRole selectRoleById(Long roleId);
+    SysRole selectRoleById(Long roleId);
 
     /**
      * 鏍¢獙瑙掕壊鍚嶇О鏄惁鍞竴
@@ -57,7 +71,7 @@
      * @param role 瑙掕壊淇℃伅
      * @return 缁撴灉
      */
-    public String checkRoleNameUnique(SysRole role);
+    String checkRoleNameUnique(SysRole role);
 
     /**
      * 鏍¢獙瑙掕壊鏉冮檺鏄惁鍞竴
@@ -65,14 +79,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鏌ヨ瑙掕壊浣跨敤鏁伴噺
@@ -80,7 +101,7 @@
      * @param roleId 瑙掕壊ID
      * @return 缁撴灉
      */
-    public int countUserRoleByRoleId(Long roleId);
+    long countUserRoleByRoleId(Long roleId);
 
     /**
      * 鏂板淇濆瓨瑙掕壊淇℃伅
@@ -88,7 +109,7 @@
      * @param role 瑙掕壊淇℃伅
      * @return 缁撴灉
      */
-    public int insertRole(SysRole role);
+    int insertRole(SysRole role);
 
     /**
      * 淇敼淇濆瓨瑙掕壊淇℃伅
@@ -96,7 +117,7 @@
      * @param role 瑙掕壊淇℃伅
      * @return 缁撴灉
      */
-    public int updateRole(SysRole role);
+    int updateRole(SysRole role);
 
     /**
      * 淇敼瑙掕壊鐘舵��
@@ -104,7 +125,7 @@
      * @param role 瑙掕壊淇℃伅
      * @return 缁撴灉
      */
-    public int updateRoleStatus(SysRole role);
+    int updateRoleStatus(SysRole role);
 
     /**
      * 淇敼鏁版嵁鏉冮檺淇℃伅
@@ -112,7 +133,7 @@
      * @param role 瑙掕壊淇℃伅
      * @return 缁撴灉
      */
-    public int authDataScope(SysRole role);
+    int authDataScope(SysRole role);
 
     /**
      * 閫氳繃瑙掕壊ID鍒犻櫎瑙掕壊
@@ -120,7 +141,7 @@
      * @param roleId 瑙掕壊ID
      * @return 缁撴灉
      */
-    public int deleteRoleById(Long roleId);
+    int deleteRoleById(Long roleId);
 
     /**
      * 鎵归噺鍒犻櫎瑙掕壊淇℃伅
@@ -128,5 +149,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