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/officesupplies/controller/OfficeSuppliesController.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java b/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java
index 3588d6c..8347921 100644
--- a/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java
+++ b/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java
@@ -7,7 +7,7 @@
 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.officesupplies.pojo.OfficeSupplies;
 import com.ruoyi.officesupplies.service.OfficeSuppliesService;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -38,14 +38,14 @@
 
     @GetMapping("/listPage")
     @Operation(summary = "鍔炲叕鐗╄祫-鍒嗛〉鏌ヨ")
-    public AjaxResult listPage(Page page, OfficeSupplies officeSupplies) {
+    public R<?> listPage(Page page, OfficeSupplies officeSupplies) {
         return officeSuppliesService.listPage(page, officeSupplies);
     }
 
     @PostMapping("/add")
     @Operation(summary = "鍔炲叕鐗╄祫-娣诲姞")
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult add(@RequestBody OfficeSupplies officeSupplies) {
+    public R<?> add(@RequestBody OfficeSupplies officeSupplies) {
         // 鎸夌収褰撳墠鏃堕棿yyyyMMdd + 褰撳ぉ鏂板鏁伴噺 + 1鐢熸垚缂栧彿
         // 鑾峰彇褰撳ぉ鏂板鏁伴噺
         long count = officeSuppliesService.count(new LambdaQueryWrapper<OfficeSupplies>()
@@ -55,22 +55,22 @@
         officeSupplies.setCode(code);
         officeSupplies.setStatus(1);
         officeSupplies.setApplyTime(new Date());
-        return officeSuppliesService.save(officeSupplies) ? success() : error();
+        return officeSuppliesService.save(officeSupplies) ? R.ok() : R.fail();
     }
 
     @PostMapping("/update")
     @Operation(summary = "鍔炲叕鐗╄祫-淇敼")
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult update(@RequestBody OfficeSupplies officeSupplies) {
-        return officeSuppliesService.updateById(officeSupplies) ? success() : error();
+    public R<?> update(@RequestBody OfficeSupplies officeSupplies) {
+        return officeSuppliesService.updateById(officeSupplies) ? R.ok() : R.fail();
     }
 
     @DeleteMapping("/delete")
     @Operation(summary = "鍔炲叕鐗╄祫-鍒犻櫎")
     @Transactional(rollbackFor = Exception.class)
-    public AjaxResult delete(@RequestBody List<Long> ids) {
-        if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
-        return officeSuppliesService.removeBatchByIds(ids) ? success() : error();
+    public R<?> delete(@RequestBody List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+        return officeSuppliesService.removeBatchByIds(ids) ? R.ok() : R.fail();
     }
 
     /**

--
Gitblit v1.9.3