From 9a30a3a8d3862a9b2ce898535b7cb51c3ddac816 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 20 五月 2026 16:01:11 +0800
Subject: [PATCH] refactor(controller): 将控制器响应结果统一为R类型并继承BaseController
---
src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java | 80 +++++++++++++++++++++------------------
1 files changed, 43 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
index a525309..614c62e 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
@@ -6,86 +6,92 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.warehouse.dto.DocumentationDto;
import com.ruoyi.warehouse.pojo.Documentation;
-import com.ruoyi.warehouse.pojo.Warehouse;
import com.ruoyi.warehouse.service.DocumentationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/documentation")
-@Api(tags = "鏂囨。淇℃伅琛�")
+@Tag(name = "鏂囨。淇℃伅琛�")
+@AllArgsConstructor
public class DocumentationController extends BaseController {
- @Autowired
private DocumentationService documentationService;
+
@GetMapping("/listPage")
- @ApiOperation("鏂囨。淇℃伅琛�-鍒嗛〉鏌ヨ")
+ @Operation(summary = "鏂囨。淇℃伅琛�-鍒嗛〉鏌ヨ")
@Log(title = "鏂囨。淇℃伅琛�-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, Documentation documentation) {
+ public R<?> listPage(Page page, Documentation documentation) {
IPage<DocumentationDto> list = documentationService.listPage(page, documentation);
- return AjaxResult.success(list);
+ return R.ok(list);
}
+
@GetMapping("/list")
- @ApiOperation("鏂囨。淇℃伅琛ㄦ煡璇�")
+ @Operation(summary = "鏂囨。淇℃伅琛ㄦ煡璇�")
@Log(title = "鏂囨。淇℃伅琛ㄦ煡璇�", businessType = BusinessType.OTHER)
- public AjaxResult list() {
+ public R<?> list() {
List<DocumentationDto> list = documentationService.listAll();
- return AjaxResult.success(list);
+ return R.ok(list);
}
+
@PostMapping("/add")
- @ApiOperation("鏂囨。淇℃伅琛�-娣诲姞")
+ @Operation(summary = "鏂囨。淇℃伅琛�-娣诲姞")
@Log(title = "鏂囨。淇℃伅琛�-娣诲姞", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody Documentation documentation) {
- return AjaxResult.success(documentationService.save(documentation));
+ public R<?> add(@RequestBody Documentation documentation) {
+ return R.ok(documentationService.save(documentation));
}
+
@PutMapping("/update")
- @ApiOperation("鏂囨。淇℃伅琛�-鏇存柊")
+ @Operation(summary = "鏂囨。淇℃伅琛�-鏇存柊")
@Log(title = "鏂囨。淇℃伅琛�-鏇存柊", businessType = BusinessType.UPDATE)
- public AjaxResult update(@RequestBody Documentation documentation) {
- return AjaxResult.success(documentationService.updateById(documentation));
+ public R<?> update(@RequestBody Documentation documentation) {
+ return R.ok(documentationService.updateById(documentation));
}
+
@DeleteMapping("/delete")
- @ApiOperation("鏂囨。淇℃伅琛�-鍒犻櫎")
+ @Operation(summary = "鏂囨。淇℃伅琛�-鍒犻櫎")
@Log(title = "鏂囨。淇℃伅琛�-鍒犻櫎", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(documentationService.deleteByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(documentationService.deleteByIds(ids));
}
@PostMapping("/export")
- @ApiOperation("鏂囨。淇℃伅琛�-瀵煎嚭")
+ @Operation(summary = "鏂囨。淇℃伅琛�-瀵煎嚭")
@Log(title = "鏂囨。淇℃伅琛�-瀵煎嚭", businessType = BusinessType.EXPORT)
- public void export(HttpServletResponse response,Documentation documentation ) {
- documentationService.export(response,documentation);
+ public void export(HttpServletResponse response, Documentation documentation) {
+ documentationService.export(response, documentation);
}
- @ApiOperation("鏂囨。淇℃伅琛�-缁熻")
+
+ @Operation(summary = "鏂囨。淇℃伅琛�-缁熻")
@GetMapping("/overview")
- public AjaxResult getOverviewStatistics() {
+ public R<?> getOverviewStatistics() {
Map<String, Object> result = new HashMap<>();
result.put("totalDocsCount", documentationService.getTotalDocsCount());
result.put("categoryNumCount", documentationService.getCategoryNumCount());
result.put("borrowedDocsCount", documentationService.getBorrowedDocsCount());
result.put("monthlyAddedDocsCount", documentationService.getMonthlyAddedDocsCount());
- return AjaxResult.success(result);
+ return R.ok(result);
}
- @ApiOperation("鏂囨。淇℃伅琛�-鍒嗙被缁熻")
+
+ @Operation(summary = "鏂囨。淇℃伅琛�-鍒嗙被缁熻")
@GetMapping("/category")
- public AjaxResult getCategoryDistribution() {
- return AjaxResult.success(documentationService.getCategoryDistribution());
+ public R<?> getCategoryDistribution() {
+ return R.ok(documentationService.getCategoryDistribution());
}
- @ApiOperation("鏂囨。淇℃伅琛�-鐘舵�佺粺璁�")
+
+ @Operation(summary = "鏂囨。淇℃伅琛�-鐘舵�佺粺璁�")
@GetMapping("/status")
- public AjaxResult getStatusDistribution() {
- return AjaxResult.success(documentationService.getStatusDistribution());
+ public R<?> getStatusDistribution() {
+ return R.ok(documentationService.getStatusDistribution());
}
}
--
Gitblit v1.9.3