From f5ee8e7afb178179c1d1d078cf42fe33dc7607f9 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 20 五月 2026 16:02:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java b/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
index 2b87fb9..ba8de8b 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
@@ -4,45 +4,46 @@
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 io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
-import org.springframework.beans.factory.annotation.Autowired;
+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;
import org.springframework.web.bind.annotation.*;
-@Api(tags = "璁惧缂洪櫡璁板綍绠＄悊")
+@Tag(name = "璁惧缂洪櫡璁板綍绠＄悊")
@RequestMapping("/defect")
+@AllArgsConstructor
@RestController
-public class DeviceDefectRecordController {
- @Autowired
+public class DeviceDefectRecordController extends BaseController {
private DeviceDefectRecordService deviceDefectRecordService;
- @ApiModelProperty("璁惧缂洪櫡璁板綍鍒楄〃")
+ @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));
}
- @ApiModelProperty("璁惧id鏌ヨ璁惧缂洪櫡璁板綍鍒楄〃")
+ @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")
- @ApiModelProperty("娣诲姞璁惧缂洪櫡璁板綍")
- public AjaxResult add(@RequestBody DeviceDefectRecord deviceDefectRecord) {
- return AjaxResult.success(deviceDefectRecordService.add(deviceDefectRecord));
+ @Operation(summary = "娣诲姞璁惧缂洪櫡璁板綍")
+ public R<?> add(@RequestBody DeviceDefectRecord deviceDefectRecord) {
+ return R.ok(deviceDefectRecordService.add(deviceDefectRecord));
}
@PostMapping("/update")
- @ApiModelProperty("淇敼璁惧缂洪櫡璁板綍")
- public AjaxResult update(@RequestBody DeviceDefectRecord deviceDefectRecord) {
- return AjaxResult.success(deviceDefectRecordService.updateByDDR(deviceDefectRecord));
+ @Operation(summary = "淇敼璁惧缂洪櫡璁板綍")
+ public R<?> update(@RequestBody DeviceDefectRecord deviceDefectRecord) {
+ return R.ok(deviceDefectRecordService.updateByDDR(deviceDefectRecord));
}
@DeleteMapping("/delete")
- @ApiModelProperty("鍒犻櫎璁惧缂洪櫡璁板綍")
- public AjaxResult delete(@PathVariable Long id) {
- return AjaxResult.success(deviceDefectRecordService.removeById(id));
+ @Operation(summary = "鍒犻櫎璁惧缂洪櫡璁板綍")
+ public R<?> delete(@PathVariable Long id) {
+ return R.ok(deviceDefectRecordService.removeById(id));
}
}
--
Gitblit v1.9.3