From fa36c51d157126e69247a5045dd83f053d32cde8 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Tue, 28 Nov 2023 20:55:44 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E5=93=8D=E5=BA=94=E6=8B=A6=E6=88=AA=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crud/annotation/NoResponseAdvice.java | 32 ------------------- .../extension/crud/base/BaseController.java | 22 +++++++------ 2 files changed, 12 insertions(+), 42 deletions(-) delete mode 100644 continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/annotation/NoResponseAdvice.java diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/annotation/NoResponseAdvice.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/annotation/NoResponseAdvice.java deleted file mode 100644 index 3f39c238..00000000 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/annotation/NoResponseAdvice.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved. - *

- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0; - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.gnu.org/licenses/lgpl.html - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package top.charles7c.continew.starter.extension.crud.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * 响应拦截忽略注解 - * - * @author BULL_BCLS - * @since 1.0.0 - */ -@Target({ElementType.METHOD}) -@Retention(RetentionPolicy.RUNTIME) -public @interface NoResponseAdvice {} \ No newline at end of file diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseController.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseController.java index 9d99e9af..1f976ccd 100644 --- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseController.java +++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/base/BaseController.java @@ -29,7 +29,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import top.charles7c.continew.starter.core.constant.StringConstants; import top.charles7c.continew.starter.extension.crud.annotation.CrudRequestMapping; -import top.charles7c.continew.starter.extension.crud.annotation.NoResponseAdvice; import top.charles7c.continew.starter.extension.crud.enums.Api; import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; import top.charles7c.continew.starter.extension.crud.model.query.SortQuery; @@ -72,9 +71,10 @@ public abstract class BaseController, L, D, Q, @Operation(summary = "分页查询列表", description = "分页查询列表") @ResponseBody @GetMapping - public PageDataResp page(Q query, @Validated PageQuery pageQuery) { + public R> page(Q query, @Validated PageQuery pageQuery) { this.checkPermission(Api.LIST); - return baseService.page(query, pageQuery); + PageDataResp pageData = baseService.page(query, pageQuery); + return R.ok(pageData); } /** @@ -89,9 +89,10 @@ public abstract class BaseController, L, D, Q, @Operation(summary = "查询树列表", description = "查询树列表") @ResponseBody @GetMapping("/tree") - public List> tree(Q query, SortQuery sortQuery) { + public R>> tree(Q query, SortQuery sortQuery) { this.checkPermission(Api.LIST); - return baseService.tree(query, sortQuery, false); + List> list = baseService.tree(query, sortQuery, false); + return R.ok(list); } /** @@ -106,9 +107,10 @@ public abstract class BaseController, L, D, Q, @Operation(summary = "查询列表", description = "查询列表") @ResponseBody @GetMapping("/list") - public List list(Q query, SortQuery sortQuery) { + public R> list(Q query, SortQuery sortQuery) { this.checkPermission(Api.LIST); - return baseService.list(query, sortQuery); + List list = baseService.list(query, sortQuery); + return R.ok(list); } /** @@ -122,9 +124,10 @@ public abstract class BaseController, L, D, Q, @Parameter(name = "id", description = "ID", example = "1", in = ParameterIn.PATH) @ResponseBody @GetMapping("/{id}") - public D get(@PathVariable Long id) { + public R get(@PathVariable Long id) { this.checkPermission(Api.LIST); - return baseService.get(id); + D detail = baseService.get(id); + return R.ok(detail); } /** @@ -190,7 +193,6 @@ public abstract class BaseController, L, D, Q, * 响应对象 */ @Operation(summary = "导出数据", description = "导出数据") - @NoResponseAdvice @GetMapping("/export") public void export(Q query, SortQuery sortQuery, HttpServletResponse response) { this.checkPermission(Api.EXPORT);