From 764cc5aabc3f99a8077250dfc5114baa6a5842c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=AE=87=E5=A5=87?= Date: Mon, 21 Jul 2025 17:08:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/StoreRoleController.java | 17 +++++++++++++---- .../controller/system/SysRoleController.java | 2 +- .../system/vo/RoleInfoEditByStoreVO.java | 3 +++ .../controller/system/vo/RoleInfoEditVO.java | 3 +++ 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/StoreRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/StoreRoleController.java index a9619a7da..58b67d824 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/StoreRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/StoreRoleController.java @@ -25,16 +25,14 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.Set; +import java.util.stream.Collectors; /** * 角色信息 @@ -84,6 +82,17 @@ public class StoreRoleController extends XktBaseController { return R.ok(BeanUtil.copyToList(all, RoleListItemVO.class)); } + @PreAuthorize("@ss.hasAnyRoles('store')") + @ApiOperation(value = "角色详情 - 档口") + @GetMapping(value = "/{id}") + public R getInfo(@PathVariable("id") Long id) { + RoleInfo infoDTO = roleService.getRoleById(id); + RoleInfoVO vo = BeanUtil.toBean(infoDTO, RoleInfoVO.class); + vo.setMenuIds(CollUtil.emptyIfNull(vo.getMenus()).stream().map(MenuInfoVO::getMenuId) + .collect(Collectors.toList())); + return R.ok(vo); + } + @PreAuthorize("@ss.hasAnyRoles('store')") @Log(title = "角色管理", businessType = BusinessType.INSERT) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java index 1ba46fbd9..f79ad9d73 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java @@ -66,7 +66,7 @@ public class SysRoleController extends XktBaseController { } @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')") - @ApiOperation(value = "角色详情 - 管理员") + @ApiOperation(value = "角色详情 - 管理员/档口") @GetMapping(value = "/{id}") public R getInfo(@PathVariable("id") Long id) { RoleInfo infoDTO = roleService.getRoleById(id); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/RoleInfoEditByStoreVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/RoleInfoEditByStoreVO.java index b1891495a..5893ecfda 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/RoleInfoEditByStoreVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/RoleInfoEditByStoreVO.java @@ -42,4 +42,7 @@ public class RoleInfoEditByStoreVO { */ @ApiModelProperty("菜单ID集") private List menuIds; + + @ApiModelProperty("备注") + private String remark; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/RoleInfoEditVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/RoleInfoEditVO.java index 1b1f0da1e..e436058eb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/RoleInfoEditVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/vo/RoleInfoEditVO.java @@ -59,4 +59,7 @@ public class RoleInfoEditVO { */ @ApiModelProperty("菜单ID集") private List menuIds; + + @ApiModelProperty("备注") + private String remark; }