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/sales/controller/SalesLedgerProductController.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index 9485919..f487aea 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -7,7 +7,6 @@
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.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.procurementrecord.utils.StockUtils;
@@ -46,9 +45,9 @@
* 鍥炴鐧昏鍒嗛〉鏌ヨ
*/
@GetMapping("/listPageSalesLedger")
- public AjaxResult listPage(Page page, SalesLedgerProductDto salesLedgerProduct) {
+ public R<?> listPageSalesLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPage(page,salesLedgerProduct);
- return AjaxResult.success(list);
+ return R.ok(list);
}
@@ -56,9 +55,9 @@
* 浠樻鐧昏鍒嗛〉鏌ヨ
*/
@GetMapping("/listPagePurchaseLedger")
- public AjaxResult listPagePurchaseLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
+ public R<?> listPagePurchaseLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPagePurchaseLedger(page,salesLedgerProduct);
- return AjaxResult.success(list);
+ return R.ok(list);
}
@@ -66,10 +65,10 @@
* 鏌ヨ浜у搧淇℃伅鍒楄〃
*/
@GetMapping("/list")
- public AjaxResult list(SalesLedgerProduct salesLedgerProduct) {
+ public R<?> list(SalesLedgerProduct salesLedgerProduct) {
List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
if (CollUtil.isEmpty(list)) {
- return AjaxResult.success(list);
+ return R.ok(list);
}
List<Long> productIds = list.stream().map(SalesLedgerProduct::getProductModelId).collect(Collectors.toList());
List<SimpleReturnOrderGroupDto> groupListByProductIds = purchaseReturnOrderProductsMapper.getReturnOrderGroupListByProductIds(productIds);
@@ -94,7 +93,7 @@
item.setReturnQuality(returnQuality);
item.setAvailableQuality(item.getQuantity().subtract(returnQuality));
});
- return AjaxResult.success(list);
+ return R.ok(list);
}
/**
@@ -113,9 +112,9 @@
* 鑾峰彇浜у搧淇℃伅璇︾粏淇℃伅
*/
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
+ public R<?> getInfo(@PathVariable("id") Long id)
{
- return success(salesLedgerProductService.selectSalesLedgerProductById(id));
+ return R.ok(salesLedgerProductService.selectSalesLedgerProductById(id));
}
/**
@@ -123,9 +122,10 @@
*/
@Log(title = "浜у搧淇℃伅", businessType = BusinessType.INSERT)
@PostMapping ("/addOrUpdateSalesLedgerProduct")
- public AjaxResult add(@RequestBody SalesLedgerProduct salesLedgerProduct)
+ public R<?> add(@RequestBody SalesLedgerProduct salesLedgerProduct)
{
- return toAjax(salesLedgerProductService.addOrUpdateSalesLedgerProduct(salesLedgerProduct));
+ salesLedgerProductService.addOrUpdateSalesLedgerProduct(salesLedgerProduct);
+ return R.ok();
}
/**
@@ -133,12 +133,13 @@
*/
@Log(title = "浜у搧淇℃伅", businessType = BusinessType.DELETE)
@DeleteMapping("/delProduct")
- public AjaxResult remove(@RequestBody Long[] ids)
+ public R<?> remove(@RequestBody Long[] ids)
{
if (ids == null || ids.length == 0) {
- return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- return toAjax(salesLedgerProductService.deleteSalesLedgerProductByIds(ids));
+ salesLedgerProductService.deleteSalesLedgerProductByIds(ids);
+ return R.ok();
}
//鏍规嵁浜у搧id鑾峰彇bom鍒ゆ柇搴撳瓨鏄惁鍏呰冻
--
Gitblit v1.9.3