From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java
index 5a328c1..3d8336b 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java
@@ -5,7 +5,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.measuringinstrumentledger.dto.SparePartsDto;
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
import com.ruoyi.measuringinstrumentledger.service.SparePartsService;
@@ -21,19 +22,19 @@
@RequestMapping("/spareParts")
@Tag(name = "澶囦欢鍒嗙被鎺ュ彛")
@AllArgsConstructor
-public class SparePartsController {
+public class SparePartsController extends BaseController {
private SparePartsService sparePartsService;
@GetMapping("/getTree")
@Operation(summary = "澶囦欢鍒嗙被-鏍戠粨鏋�")
- public AjaxResult getTree(){
+ public R<?> getTree(){
List<SparePartsDto> tree = sparePartsService.getTree();
- return AjaxResult.success(tree);
+ return R.ok(tree);
}
@GetMapping("/listPage")
@Operation(summary = "澶囦欢鍒嗙被-鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, SpareParts spareParts){
+ public R<?> listPage(Page page, SpareParts spareParts){
IPage<SparePartsDto> listPage = sparePartsService.listPage(page, spareParts);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
// @GetMapping("/list")
// @Operation(summary = "澶囦欢鍒嗙被-鏌ヨ鎵�鏈�")
@@ -43,20 +44,20 @@
@PostMapping("/add")
@Operation(summary = "澶囦欢鍒嗙被-娣诲姞")
@Log(title = "澶囦欢鍒嗙被-娣诲姞", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody SpareParts spareParts){
- return AjaxResult.success(sparePartsService.save(spareParts));
+ public R<?> add(@RequestBody SpareParts spareParts){
+ return R.ok(sparePartsService.save(spareParts));
}
@PostMapping("/update")
@Operation(summary = "澶囦欢鍒嗙被-鏇存柊")
@Log(title = "澶囦欢鍒嗙被-鏇存柊", businessType = BusinessType.UPDATE)
- public AjaxResult update(@RequestBody SpareParts spareParts){
- return AjaxResult.success(sparePartsService.updateById(spareParts));
+ public R<?> update(@RequestBody SpareParts spareParts){
+ return R.ok(sparePartsService.updateById(spareParts));
}
@DeleteMapping("/delete/{id}")
@Operation(summary = "澶囦欢鍒嗙被-鍒犻櫎")
@Log(title = "澶囦欢鍒嗙被-鍒犻櫎", businessType = BusinessType.DELETE)
- public AjaxResult delete(@PathVariable Long id){
- return AjaxResult.success(sparePartsService.removeById(id));
+ public R<?> delete(@PathVariable Long id){
+ return R.ok(sparePartsService.removeById(id));
}
}
--
Gitblit v1.9.3