From 9f25925d4694e709a33f995c395d1a12c4af15cf Mon Sep 17 00:00:00 2001 From: Charles7c Date: Fri, 31 Mar 2023 21:17:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=20BaseController=20AP?= =?UTF-8?q?I=20=E6=96=B9=E6=B3=95=E7=9A=84=E8=AE=BF=E9=97=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E4=BF=AE=E9=A5=B0=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cnadmin/common/base/BaseController.java | 16 ++++++++-------- .../webapi/controller/system/MenuController.java | 4 ++-- .../webapi/controller/system/UserController.java | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java index 7fdb41d6..08de753c 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java @@ -75,7 +75,7 @@ public abstract class BaseController, V, D, Q, @Operation(summary = "分页查询列表") @ResponseBody @GetMapping - protected R> page(@Validated Q query, @Validated PageQuery pageQuery) { + public R> page(@Validated Q query, @Validated PageQuery pageQuery) { this.checkPermission("list"); PageDataVO pageDataVO = baseService.page(query, pageQuery); return R.ok(pageDataVO); @@ -93,7 +93,7 @@ public abstract class BaseController, V, D, Q, @Operation(summary = "查询树列表") @ResponseBody @GetMapping("/tree") - protected R>> tree(@Validated Q query, @Validated SortQuery sortQuery) { + public R>> tree(@Validated Q query, @Validated SortQuery sortQuery) { this.checkPermission("list"); List> list = baseService.tree(query, sortQuery, false); return R.ok(list); @@ -111,7 +111,7 @@ public abstract class BaseController, V, D, Q, @Operation(summary = "查询列表") @ResponseBody @GetMapping("/list") - protected R> list(@Validated Q query, @Validated SortQuery sortQuery) { + public R> list(@Validated Q query, @Validated SortQuery sortQuery) { this.checkPermission("list"); List list = baseService.list(query, sortQuery); return R.ok(list); @@ -128,7 +128,7 @@ public abstract class BaseController, V, D, Q, @Parameter(name = "id", description = "ID", in = ParameterIn.PATH) @ResponseBody @GetMapping("/{id}") - protected R get(@PathVariable Long id) { + public R get(@PathVariable Long id) { this.checkPermission("list"); D detail = baseService.get(id); return R.ok(detail); @@ -144,7 +144,7 @@ public abstract class BaseController, V, D, Q, @Operation(summary = "新增数据") @ResponseBody @PostMapping - protected R add(@Validated(BaseRequest.Add.class) @RequestBody C request) { + public R add(@Validated(BaseRequest.Add.class) @RequestBody C request) { this.checkPermission("add"); Long id = baseService.add(request); return R.ok("新增成功", id); @@ -162,7 +162,7 @@ public abstract class BaseController, V, D, Q, @Operation(summary = "修改数据") @ResponseBody @PutMapping("/{id}") - protected R update(@Validated(BaseRequest.Update.class) @RequestBody C request, @PathVariable Long id) { + public R update(@Validated(BaseRequest.Update.class) @RequestBody C request, @PathVariable Long id) { this.checkPermission("update"); baseService.update(request, id); return R.ok("修改成功"); @@ -179,7 +179,7 @@ public abstract class BaseController, V, D, Q, @Parameter(name = "ids", description = "ID 列表", in = ParameterIn.PATH) @ResponseBody @DeleteMapping("/{ids}") - protected R delete(@PathVariable List ids) { + public R delete(@PathVariable List ids) { this.checkPermission("delete"); baseService.delete(ids); return R.ok("删除成功"); @@ -197,7 +197,7 @@ public abstract class BaseController, V, D, Q, */ @Operation(summary = "导出数据") @GetMapping("/export") - protected void export(@Validated Q query, @Validated SortQuery sortQuery, HttpServletResponse response) { + public void export(@Validated Q query, @Validated SortQuery sortQuery, HttpServletResponse response) { this.checkPermission("export"); baseService.export(query, sortQuery, response); } diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/MenuController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/MenuController.java index 8a840c5a..d93fe16b 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/MenuController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/MenuController.java @@ -52,14 +52,14 @@ public class MenuController extends BaseController add(@Validated(BaseRequest.Add.class) @RequestBody MenuRequest request) { + public R add(@Validated(BaseRequest.Add.class) @RequestBody MenuRequest request) { this.checkPath(request); return super.add(request); } @Override @SaCheckPermission("system:menu:update") - protected R update(@Validated(BaseRequest.Update.class) @RequestBody MenuRequest request, @PathVariable Long id) { + public R update(@Validated(BaseRequest.Update.class) @RequestBody MenuRequest request, @PathVariable Long id) { this.checkPath(request); return super.update(request, id); } diff --git a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserController.java b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserController.java index 66a27fb9..69147174 100644 --- a/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserController.java +++ b/continew-admin-webapi/src/main/java/top/charles7c/cnadmin/webapi/controller/system/UserController.java @@ -53,7 +53,7 @@ public class UserController extends BaseController add(@Validated(BaseRequest.Add.class) @RequestBody UserRequest request) { + public R add(@Validated(BaseRequest.Add.class) @RequestBody UserRequest request) { Long id = baseService.add(request); return R.ok(String.format("新增成功，请牢记默认密码：%s", SysConsts.DEFAULT_PASSWORD), id); }