From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java b/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
index 1fd1c04..ba8de8b 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
@@ -4,7 +4,8 @@
import com.ruoyi.device.dto.DeviceDefectRecordDto;
import com.ruoyi.device.pojo.DeviceDefectRecord;
import com.ruoyi.device.service.DeviceDefectRecordService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -14,35 +15,35 @@
@RequestMapping("/defect")
@AllArgsConstructor
@RestController
-public class DeviceDefectRecordController {
+public class DeviceDefectRecordController extends BaseController {
private DeviceDefectRecordService deviceDefectRecordService;
@Operation(summary = "璁惧缂洪櫡璁板綍鍒楄〃")
@GetMapping("/page")
- public AjaxResult page(Page page , DeviceDefectRecordDto deviceDefectRecordDto) {
- return AjaxResult.success(deviceDefectRecordService.listPage(page,deviceDefectRecordDto));
+ public R<?> page(Page page , DeviceDefectRecordDto deviceDefectRecordDto) {
+ return R.ok(deviceDefectRecordService.listPage(page,deviceDefectRecordDto));
}
@Operation(summary = "璁惧id鏌ヨ璁惧缂洪櫡璁板綍鍒楄〃")
@GetMapping("/find/{deviceLedgerId}")
- public AjaxResult find(@PathVariable Long deviceLedgerId) {
+ public R<?> find(@PathVariable Long deviceLedgerId) {
DeviceDefectRecordDto deviceDefectRecordDto = new DeviceDefectRecordDto();
deviceDefectRecordDto.setDeviceLedgerId(deviceLedgerId);
- return AjaxResult.success(deviceDefectRecordService.listPage(new Page<>(1,-1),deviceDefectRecordDto));
+ return R.ok(deviceDefectRecordService.listPage(new Page<>(1,-1),deviceDefectRecordDto));
}
@PostMapping("/add")
@Operation(summary = "娣诲姞璁惧缂洪櫡璁板綍")
- public AjaxResult add(@RequestBody DeviceDefectRecord deviceDefectRecord) {
- return AjaxResult.success(deviceDefectRecordService.add(deviceDefectRecord));
+ public R<?> add(@RequestBody DeviceDefectRecord deviceDefectRecord) {
+ return R.ok(deviceDefectRecordService.add(deviceDefectRecord));
}
@PostMapping("/update")
@Operation(summary = "淇敼璁惧缂洪櫡璁板綍")
- public AjaxResult update(@RequestBody DeviceDefectRecord deviceDefectRecord) {
- return AjaxResult.success(deviceDefectRecordService.updateByDDR(deviceDefectRecord));
+ public R<?> update(@RequestBody DeviceDefectRecord deviceDefectRecord) {
+ return R.ok(deviceDefectRecordService.updateByDDR(deviceDefectRecord));
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎璁惧缂洪櫡璁板綍")
- public AjaxResult delete(@PathVariable Long id) {
- return AjaxResult.success(deviceDefectRecordService.removeById(id));
+ public R<?> delete(@PathVariable Long id) {
+ return R.ok(deviceDefectRecordService.removeById(id));
}
}
--
Gitblit v1.9.3