From 9b21069ae55c7f8a3753c099479d35c1a4071cf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com> Date: Mon, 18 Mar 2024 21:48:17 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=96=B0=E5=A2=9E=E6=97=B6=E8=8F=9C=E5=8D=95=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E5=92=8C=E6=9D=83=E9=99=90=E5=AD=97=E7=AC=A6=E4=B8=B2?= =?UTF-8?q?=E5=8E=BB=E9=87=8D=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/SysMenuController.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java index e5f7f539d..563dcf7ff 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java @@ -19,6 +19,7 @@ package com.pig4cloud.pigx.admin.controller; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.pig4cloud.pigx.admin.api.entity.SysMenu; import com.pig4cloud.pigx.admin.service.SysMenuService; import com.pig4cloud.pigx.common.core.util.R; @@ -27,6 +28,7 @@ import com.pig4cloud.pigx.common.security.util.SecurityUtils; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; +import org.springdoc.api.annotations.ParameterObject; import org.springframework.http.HttpHeaders; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -81,19 +83,20 @@ public class SysMenuController { */ @GetMapping("/tree/{roleId}") public R getRoleTree(@PathVariable Long roleId) { - return R.ok( - sysMenuService.findMenuByRoleId(roleId).stream().map(SysMenu::getMenuId).collect(Collectors.toList())); + return R + .ok(sysMenuService.findMenuByRoleId(roleId).stream().map(SysMenu::getMenuId).collect(Collectors.toList())); } - /** - * 通过ID查询菜单的详细信息 - * @param id 菜单ID - * @return 菜单详细信息 - */ - @GetMapping("/{id}") - public R getById(@PathVariable Long id) { - return R.ok(sysMenuService.getById(id)); - } + /** + * 通过ID查询菜单的详细信息 + * + * @param query 菜单ID + * @return 菜单详细信息 + */ + @GetMapping("/details") + public R getById(@ParameterObject SysMenu query) { + return R.ok(sysMenuService.getOne(Wrappers.query(query), false)); + } /** * 新增菜单