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/aftersalesservice/controller/AfterSalesServiceController.java |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
index 5f4c3a8..0c424fb 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
@@ -10,7 +10,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.project.system.domain.SysUser;
 import com.ruoyi.project.system.mapper.SysUserMapper;
 import com.ruoyi.sales.dto.SalesLedgerDto;
@@ -45,9 +45,9 @@
     @GetMapping("/listPage")
     @Operation(summary = "鍞悗鏈嶅姟-鍒嗛〉鏌ヨ")
     @Log(title = "鍞悗鏈嶅姟-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
-    public AjaxResult listPage(Page page, AfterSalesServiceNewDto afterSalesService) {
+    public R<?> listPage(Page page, AfterSalesServiceNewDto afterSalesService) {
         IPage<AfterSalesServiceNewDto> listPage = afterSalesServiceService.listPage(page, afterSalesService);
-        return AjaxResult.success(listPage);
+        return R.ok(listPage);
     }
 
     @Log(title = "鍞悗鏈嶅姟-鍙嶉鐧昏", businessType = BusinessType.EXPORT)
@@ -85,14 +85,14 @@
     @PostMapping("/add")
     @Operation(summary = "鍞悗鏈嶅姟-鏂板")
     @Log(title = "鍞悗鏈嶅姟-鏂板", businessType = BusinessType.INSERT)
-    public AjaxResult add(@RequestBody AfterSalesServiceNewDto afterSalesServiceNewDto) {
-        return afterSalesServiceService.addAfterSalesServiceDto(afterSalesServiceNewDto) ? AjaxResult.success() : AjaxResult.error();
+    public R<?> add(@RequestBody AfterSalesServiceNewDto afterSalesServiceNewDto) {
+        return afterSalesServiceService.addAfterSalesServiceDto(afterSalesServiceNewDto) ? R.ok() : R.fail();
     }
 
     @PostMapping("/update")
     @Operation(summary = "鍞悗鏈嶅姟-淇敼")
     @Log(title = "鍞悗鏈嶅姟-淇敼", businessType = BusinessType.UPDATE)
-    public AjaxResult update(@RequestBody AfterSalesServiceNewDto afterSalesServiceNewDto) {
+    public R<?> update(@RequestBody AfterSalesServiceNewDto afterSalesServiceNewDto) {
         if (afterSalesServiceNewDto.getProductModelIdList() != null && afterSalesServiceNewDto.getProductModelIdList().isEmpty() ) {
             String productModelIds = afterSalesServiceNewDto.getProductModelIdList().stream()
                     .map(String::valueOf)
@@ -100,24 +100,24 @@
             afterSalesServiceNewDto.setProductModelIds(productModelIds);
         }
         boolean update = afterSalesServiceService.updateById(afterSalesServiceNewDto);
-        return update ? AjaxResult.success() : AjaxResult.error();
+        return update ? R.ok() : R.fail();
     }
 
     @DeleteMapping("/delete")
     @Operation(summary = "鍞悗鏈嶅姟-鍒犻櫎")
     @Log(title = "鍞悗鏈嶅姟-鍒犻櫎", businessType = BusinessType.DELETE)
-    public AjaxResult delete(@RequestBody List<Long> ids) {
+    public R<?> delete(@RequestBody List<Long> ids) {
         if (CollectionUtils.isEmpty(ids)) {
-            return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+            return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
         }
         boolean delete = afterSalesServiceService.removeByIds(ids);
-        return delete ? AjaxResult.success() : AjaxResult.error();
+        return delete ? R.ok() : R.fail();
     }
 
     @PostMapping("/dispose")
     @Operation(summary = "鍞悗鏈嶅姟-澶勭悊")
     @Log(title = "鍞悗鏈嶅姟-澶勭悊", businessType = BusinessType.UPDATE)
-    public AjaxResult dispose(@RequestBody AfterSalesService afterSalesService) {
+    public R<?> dispose(@RequestBody AfterSalesService afterSalesService) {
         AfterSalesService byId = afterSalesServiceService.getById(afterSalesService.getId());
         if(byId == null) throw new RuntimeException("鏈壘鍒拌鏁版嵁");
         if(byId.getStatus().equals(2)) throw new RuntimeException("璇ユ暟鎹凡澶勭悊");
@@ -126,28 +126,28 @@
         afterSalesService.setDisposeNickName(sysUser.getNickName());
         afterSalesService.setStatus(2);
         boolean update = afterSalesServiceService.updateById(afterSalesService);
-        return update ? AjaxResult.success() : AjaxResult.error();
+        return update ? R.ok() : R.fail();
     }
 
 
     @GetMapping("listSalesLedger")
     @Operation(summary = "鍞悗鏈嶅姟-鑾峰彇閿�鍞彴璐�")
-    public AjaxResult listSalesLedger(SalesLedgerDto salesLedgerDto, Page page) {
+    public R<?> listSalesLedger(SalesLedgerDto salesLedgerDto, Page page) {
         IPage<SalesLedgerDto> list = salesLedgerService.listSalesLedger(salesLedgerDto,page);
-        return AjaxResult.success(list);
+        return R.ok(list);
     }
 
 
     @GetMapping("getById")
     @Operation(summary = "鍞悗鏈嶅姟-鏍规嵁id鑾峰彇璇︽儏")
-    public AjaxResult getById(Long id) {
-        return AjaxResult.success(afterSalesServiceService.getAfterSalesServiceNewDtoById(id));
+    public R<?> getById(Long id) {
+        return R.ok(afterSalesServiceService.getAfterSalesServiceNewDtoById(id));
     }
 
     @Operation(summary = "鍞悗鏈嶅姟-缁熻宸ュ崟鎯呭喌")
     @GetMapping("count")
-    public AjaxResult count() {
-        return AjaxResult.success(afterSalesServiceService.countAfterSalesService());
+    public R<?> count() {
+        return R.ok(afterSalesServiceService.countAfterSalesService());
     }
 
 }

--
Gitblit v1.9.3