From 02eb9d41eb2f201ce18d8481f56d82fb89641d42 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 16 二月 2024 20:54:15 +0800 Subject: [PATCH] # --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java index e64ed8a..36bba78 100644 --- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java +++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/sys/controller/RoleController.java @@ -12,7 +12,8 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import java.util.List; +import java.util.Arrays; +import java.util.Map; /** * Created by vincent on 2/13/2024 @@ -25,22 +26,20 @@ private RoleService roleService; @PreAuthorize("hasAuthority('sys:role:list')") - @OperationLog @PostMapping("/role/page") - public R page(@RequestBody BaseParam param) { - PageParam<Role, BaseParam> page = new PageParam<>(param); - return R.ok().add(roleService.page(page, page.getWrapper())); + public R page(@RequestBody Map<String, Object> map) { + BaseParam baseParam = buildParam(map, BaseParam.class); + PageParam<Role, BaseParam> pageParam = new PageParam<>(baseParam); + return R.ok().add(roleService.page(pageParam, pageParam.buildWrapper())); } @PreAuthorize("hasAuthority('sys:role:list')") - @OperationLog @PostMapping("/role/list") public R list(@RequestBody BaseParam param) { return R.ok().add(roleService.list()); } @PreAuthorize("hasAuthority('sys:role:list')") - @OperationLog @GetMapping("/role/{id}") public R get(@PathVariable("id") Long id) { return R.ok().add(roleService.getById(id)); @@ -86,12 +85,18 @@ @PreAuthorize("hasAuthority('sys:role:remove')") @OperationLog("鍒犻櫎瑙掕壊") - @PostMapping("/role/remove") - public R remove(@RequestBody List<Long> ids) { - if (!roleService.removeByIds(ids)) { + @PostMapping("/role/remove/{ids}") + public R remove(@PathVariable Long[] ids) { + if (!roleService.removeByIds(Arrays.asList(ids))) { return R.error("鍒犻櫎澶辫触"); } return R.ok("鍒犻櫎鎴愬姛"); } + @PreAuthorize("hasAuthority('sys:role:list')") + @PostMapping("/role/export") + public R export(@RequestBody Role role) { + return R.ok("瀵煎嚭鎴愬姛"); + } + } -- Gitblit v1.9.1