From 516a98353f103b44b87a36251cffaf5df8a8f7bc Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 22 一月 2026 10:12:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/device/controller/DeviceRepairController.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
index 5c3dd58..7ac0907 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
@@ -3,18 +3,16 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceRepairDto;
-import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceRepairService;
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
import java.util.Arrays;
@Api(tags = "璁惧鎶ヤ慨绠＄悊")
@@ -28,19 +26,19 @@
@Autowired
private IDeviceLedgerService deviceLedgerService;
- @ApiModelProperty("璁惧鎶ヤ慨鍒楄〃")
+ @ApiOperation("璁惧鎶ヤ慨鍒楄〃")
@GetMapping("/page")
public AjaxResult page(Page page , DeviceRepairDto deviceRepairDto) {
return AjaxResult.success(deviceRepairService.queryPage(page,deviceRepairDto));
}
@PostMapping()
- @ApiModelProperty("娣诲姞璁惧鎶ヤ慨")
+ @ApiOperation("娣诲姞璁惧鎶ヤ慨")
public AjaxResult add( @RequestBody DeviceRepair deviceRepair) {
return deviceRepairService.saveDeviceRepair(deviceRepair);
}
- @ApiModelProperty("鏍规嵁id鏌ヨ璁惧鎶ヤ慨")
+ @ApiOperation("鏍规嵁id鏌ヨ璁惧鎶ヤ慨")
@GetMapping("/{id}")
public AjaxResult detail(@PathVariable Long id) {
DeviceRepairDto byId = deviceRepairService.detailById(id);
@@ -48,20 +46,19 @@
}
@PutMapping ()
- @ApiModelProperty("淇敼璁惧鎶ヤ慨")
+ @ApiOperation("淇敼璁惧鎶ヤ慨")
public AjaxResult update( @RequestBody DeviceRepair deviceRepair) {
return deviceRepairService.updateDeviceRepair(deviceRepair);
}
@PostMapping ("repair")
- @ApiModelProperty("璁惧缁翠慨")
+ @ApiOperation("璁惧缁翠慨")
public AjaxResult repair( @RequestBody DeviceRepair deviceRepair) {
- deviceRepair.setStatus(1);
return deviceRepairService.updateDeviceRepair(deviceRepair);
}
@DeleteMapping("/{ids}")
- @ApiModelProperty("鍒犻櫎璁惧鎶ヤ慨")
+ @ApiOperation("鍒犻櫎璁惧鎶ヤ慨")
public AjaxResult delete(@PathVariable("ids") Long[] ids) {
boolean b = deviceRepairService.removeBatchByIds(Arrays.asList(ids));
if (!b) {
@@ -71,7 +68,7 @@
}
@PostMapping("export")
- @ApiModelProperty("瀵煎嚭璁惧鎶ヤ慨")
+ @ApiOperation("瀵煎嚭璁惧鎶ヤ慨")
public void export(HttpServletResponse response, Long[] ids) {
deviceRepairService.export(response, ids);
}
--
Gitblit v1.9.3