From e7a970151c40925eefa1fe837ac06e93594fcf82 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 26 五月 2026 09:56:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_娌冲崡楣ゅ' into dev_pro_娌冲崡楣ゅ
---
src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java b/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
index dc103fb..8424f60 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
@@ -2,29 +2,28 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceDefectRecordDto;
-import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceDefectRecord;
-import com.ruoyi.device.pojo.DeviceLedger;
-import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.DeviceDefectRecordService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
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 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
private DeviceDefectRecordService deviceDefectRecordService;
- @ApiModelProperty("璁惧缂洪櫡璁板綍鍒楄〃")
+ @Operation(summary = "璁惧缂洪櫡璁板綍鍒楄〃")
@GetMapping("/page")
public AjaxResult page(Page page , DeviceDefectRecordDto deviceDefectRecordDto) {
return AjaxResult.success(deviceDefectRecordService.listPage(page,deviceDefectRecordDto));
}
- @ApiModelProperty("璁惧id鏌ヨ璁惧缂洪櫡璁板綍鍒楄〃")
+ @Operation(summary = "璁惧id鏌ヨ璁惧缂洪櫡璁板綍鍒楄〃")
@GetMapping("/find/{deviceLedgerId}")
public AjaxResult find(@PathVariable Long deviceLedgerId) {
DeviceDefectRecordDto deviceDefectRecordDto = new DeviceDefectRecordDto();
@@ -32,18 +31,21 @@
return AjaxResult.success(deviceDefectRecordService.listPage(new Page<>(1,-1),deviceDefectRecordDto));
}
+ @Log(title = "鏂板璁惧缂洪櫡璁板綍", businessType = BusinessType.INSERT)
@PostMapping("/add")
- @ApiModelProperty("娣诲姞璁惧缂洪櫡璁板綍")
+ @Operation(summary = "娣诲姞璁惧缂洪櫡璁板綍")
public AjaxResult add(@RequestBody DeviceDefectRecord deviceDefectRecord) {
return AjaxResult.success(deviceDefectRecordService.add(deviceDefectRecord));
}
+ @Log(title = "淇敼璁惧缂洪櫡璁板綍", businessType = BusinessType.UPDATE)
@PostMapping("/update")
- @ApiModelProperty("淇敼璁惧缂洪櫡璁板綍")
+ @Operation(summary = "淇敼璁惧缂洪櫡璁板綍")
public AjaxResult update(@RequestBody DeviceDefectRecord deviceDefectRecord) {
return AjaxResult.success(deviceDefectRecordService.updateByDDR(deviceDefectRecord));
}
+ @Log(title = "鍒犻櫎璁惧缂洪櫡璁板綍", businessType = BusinessType.DELETE)
@DeleteMapping("/delete")
- @ApiModelProperty("鍒犻櫎璁惧缂洪櫡璁板綍")
+ @Operation(summary = "鍒犻櫎璁惧缂洪櫡璁板綍")
public AjaxResult delete(@PathVariable Long id) {
return AjaxResult.success(deviceDefectRecordService.removeById(id));
}
--
Gitblit v1.9.3