update 优化 SysPermissionService 规范化

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java

@@ -20,9 +20,9 @@ import com.ruoyi.system.domain.vo.DeptTreeSelectVo;
 import com.ruoyi.system.domain.vo.SysRoleVo;
 import com.ruoyi.system.domain.vo.SysUserVo;
 import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysPermissionService;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.system.service.SysPermissionService;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -44,7 +44,7 @@ public class SysRoleController extends BaseController {
     private final ISysRoleService roleService;
     private final ISysUserService userService;
     private final ISysDeptService deptService;
-    private final SysPermissionService permissionService;
+    private final ISysPermissionService permissionService;
 
     /**
      * 获取角色信息列表

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java

@@ -0,0 +1,30 @@
+package com.ruoyi.system.service;
+
+import java.util.Set;
+
+/**
+ * 用户权限处理
+ *
+ * @author Lion Li
+ */
+public interface ISysPermissionService {
+
+    /**
+     * 获取角色数据权限
+     *
+     * @param userId  用户id
+     * @param isAdmin 是否管理员
+     * @return 角色权限信息
+     */
+    Set<String> getRolePermission(Long userId, boolean isAdmin);
+
+    /**
+     * 获取菜单数据权限
+     *
+     * @param userId  用户id
+     * @param isAdmin 是否管理员
+     * @return 菜单权限信息
+     */
+    Set<String> getMenuPermission(Long userId, boolean isAdmin);
+
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java

@@ -46,7 +46,7 @@ public class SysLoginService {
 
     private final SysUserMapper userMapper;
     private final ISysConfigService configService;
-    private final SysPermissionService permissionService;
+    private final ISysPermissionService permissionService;
 
     @Value("${user.password.maxRetryCount}")
     private Integer maxRetryCount;

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java

@@ -1,5 +1,8 @@
-package com.ruoyi.system.service;
+package com.ruoyi.system.service.impl;
 
+import com.ruoyi.system.service.ISysMenuService;
+import com.ruoyi.system.service.ISysPermissionService;
+import com.ruoyi.system.service.ISysRoleService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -13,7 +16,7 @@ import java.util.Set;
  */
 @RequiredArgsConstructor
 @Service
-public class SysPermissionService {
+public class SysPermissionServiceImpl implements ISysPermissionService {
 
     private final ISysRoleService roleService;
     private final ISysMenuService menuService;
@@ -25,6 +28,7 @@ public class SysPermissionService {
      * @param isAdmin 是否管理员
      * @return 角色权限信息
      */
+    @Override
     public Set<String> getRolePermission(Long userId, boolean isAdmin) {
         Set<String> roles = new HashSet<>();
         // 管理员拥有所有权限
@@ -43,6 +47,7 @@ public class SysPermissionService {
      * @param isAdmin 是否管理员
      * @return 菜单权限信息
      */
+    @Override
     public Set<String> getMenuPermission(Long userId, boolean isAdmin) {
         Set<String> perms = new HashSet<>();
         // 管理员拥有所有权限