用户权限

src/main/java/com/ycwl/basic/controller/pc/MenuController.java

@@ -1,45 +0,0 @@
-package com.ycwl.basic.controller.pc;
-
-import com.ycwl.basic.annotation.IgnoreToken;
-import com.ycwl.basic.model.pc.menu.entity.MenuEntity;
-import com.ycwl.basic.service.pc.MenuService;
-import com.ycwl.basic.utils.ApiResponse;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @Author：longbinbin
- * @Date：2024/12/3 10:03
- */
-@RestController
-@RequestMapping("/api/menu/v1")
-@Api(tags = "系统菜单管理")
-public class MenuController {
-
-    private MenuService menuService;
-
-
-    @GetMapping(value = "/list/{type}")
-    @ApiOperation(value = " 菜单列表")
-    @IgnoreToken
-    public ApiResponse list(@PathVariable("type") Integer type) {
-        return menuService.list(type);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "添加菜单")
-    public ApiResponse add(@RequestBody MenuEntity menu) {
-        return menuService.add(menu);
-    }
-    @PostMapping("/update")
-    @ApiOperation(value = "修改菜单")
-    public ApiResponse update(@RequestBody MenuEntity menu) {
-        return menuService.update(menu);
-    }
-    @GetMapping("/delete/{id}")
-    @ApiOperation(value = "删除菜单")
-    public ApiResponse delete(@PathVariable("id") Long id) {
-        return menuService.deleteById(id);
-    }
-}

src/main/java/com/ycwl/basic/controller/pc/PermissionController.java

@@ -1,10 +1,14 @@
 package com.ycwl.basic.controller.pc;
 
 import com.ycwl.basic.constant.BaseContextHandler;
+import com.ycwl.basic.mapper.AdminUserMapper;
+import com.ycwl.basic.model.pc.adminUser.entity.LoginEntity;
 import com.ycwl.basic.model.pc.permission.entity.PermissionEntity;
 import com.ycwl.basic.model.pc.permission.req.PermissionSaveReq;
 import com.ycwl.basic.model.pc.permission.resp.PermissionResp;
+import com.ycwl.basic.model.pc.role.resp.RolePermissionResp;
 import com.ycwl.basic.service.pc.PermissionService;
+import com.ycwl.basic.service.pc.RoleService;
 import com.ycwl.basic.utils.ApiResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -28,15 +32,29 @@ import static com.ycwl.basic.constant.JwtRoleConstant.MERCHANT;
 public class PermissionController {
     @Autowired
     private PermissionService permissionService;
+    @Autowired
+    private AdminUserMapper adminUserMapper;
+    @Autowired
+    private RoleService roleService;
 
     @GetMapping("/get/")
     public ApiResponse<PermissionResp> getPermissionByUser() {
         String userId = BaseContextHandler.getUserId();
-        PermissionEntity permission = permissionService.getPermissionByUserId(Long.parseLong(userId));
-        if (permission == null || StringUtils.isEmpty(permission.getPermString())) {
-            return ApiResponse.success(new PermissionResp(new ArrayList<>(), new ArrayList<>()));
+        if (MERCHANT.type.equals(BaseContextHandler.getRoleId())) {
+            PermissionEntity permission = permissionService.getPermissionByUserId(Long.parseLong(userId));
+            if (permission == null || StringUtils.isEmpty(permission.getPermString())) {
+                return ApiResponse.success(new PermissionResp(new ArrayList<>(), new ArrayList<>()));
+            }
+            return ApiResponse.success(new PermissionResp(Arrays.asList(StringUtils.split(permission.getPermString(), ",")), Arrays.asList(StringUtils.split(permission.getMenuString(), ","))));
+        } else {
+            // admin
+            LoginEntity login = adminUserMapper.getById(Long.parseLong(userId));
+            RolePermissionResp permissionByRoleId = roleService.getPermissionByRoleId(login.getRoleId());
+            if (permissionByRoleId == null) {
+                return ApiResponse.success(new PermissionResp(new ArrayList<>(), new ArrayList<>()));
+            }
+            return ApiResponse.success(new PermissionResp(Arrays.asList(StringUtils.split(permissionByRoleId.getPermStr(), ",")), Arrays.asList(StringUtils.split(permissionByRoleId.getMenuStr(), ","))));
         }
-        return ApiResponse.success(new PermissionResp(Arrays.asList(StringUtils.split(permission.getPermString(), ",")), Arrays.asList(StringUtils.split(permission.getMenuString(), ","))));
     }
 
     @ApiOperation("根据用户ID查询权限信息")

src/main/java/com/ycwl/basic/controller/pc/RoleController.java

@@ -2,16 +2,20 @@ package com.ycwl.basic.controller.pc;
 
 import com.github.pagehelper.PageInfo;
 import com.ycwl.basic.annotation.IgnoreToken;
+import com.ycwl.basic.model.pc.permission.resp.PermissionResp;
 import com.ycwl.basic.model.pc.role.req.AddOrUpdateRoleReqVO;
 import com.ycwl.basic.model.pc.role.req.RoleListReqVO;
 import com.ycwl.basic.model.pc.role.resp.RoleListRespVO;
+import com.ycwl.basic.model.pc.role.resp.RolePermissionResp;
 import com.ycwl.basic.service.pc.RoleService;
 import com.ycwl.basic.utils.ApiResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 
 @RestController
@@ -24,34 +28,38 @@ public class RoleController {
 
     @PostMapping(value = "/page")
     @ApiOperation(value = "角色列表分页查询")
-    @IgnoreToken
     public ApiResponse<PageInfo<RoleListRespVO>> page(@RequestBody RoleListReqVO roleListReqVO) {
         return roleService.pageQuery(roleListReqVO);
     }
     @PostMapping(value = "/list")
     @ApiOperation(value = "角色列表")
-    @IgnoreToken
     public ApiResponse<List<RoleListRespVO>> list(@RequestBody RoleListReqVO roleListReqVO) {
         return roleService.list(roleListReqVO);
     }
+    @GetMapping("/{roleId}/permission")
+    @ApiOperation(value = "角色权限列表")
+    public ApiResponse<PermissionResp> getPermissionByRoleId(@PathVariable("roleId") Long roleId) {
+        RolePermissionResp permission = roleService.getPermissionByRoleId(roleId);
+        if (permission == null) {
+            return ApiResponse.fail("角色不存在");
+        }
+        return ApiResponse.success(new PermissionResp(Arrays.asList(StringUtils.split(permission.getPermStr(), ",")), Arrays.asList(StringUtils.split(permission.getMenuStr(), ","))));
+    }
 
     @PostMapping(value = "/addOrUpdate")
     @ApiOperation(value = "添加或更新角色")
-    @IgnoreToken
     public ApiResponse addOrUpdate(@RequestBody AddOrUpdateRoleReqVO addOrUpdateRoleReqVO) {
         return roleService.addOrUpdate(addOrUpdateRoleReqVO);
     }
 
     @GetMapping(value = "/delete/{id}")
     @ApiOperation(value = "删除")
-    @IgnoreToken
     public ApiResponse delete(@PathVariable("id") String id) {
         return roleService.delete(id);
     }
 
     @GetMapping(value = "/updateReturnMenu/{id}")
     @ApiOperation(value = "编辑回显该角色当前菜单")
-    @IgnoreToken
     public ApiResponse updateReturnMenu(@PathVariable("id") String id) {
         return roleService.updateReturnMenu(id);
     }
@@ -60,7 +68,6 @@ public class RoleController {
 
     @GetMapping(value = "/updateStatus/{id}")
     @ApiOperation(value = "更改角色类型状态")
-    //@IgnoreToken
     public ApiResponse updateStatus(@PathVariable("id") String id) {
         return roleService.updateStatus(id);
     }