From fa59bd5bf64f818111b26744a3b51b936ab6f389 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 01 七月 2025 09:50:00 +0800
Subject: [PATCH] 2025-07-01 bug修改
---
src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index acbb8a5..e3502ba 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -9,14 +9,16 @@
import com.ruoyi.device.service.IDeviceMaintenanceService;
import com.ruoyi.device.service.IDeviceRepairService;
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 org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
+import java.util.Arrays;
-
+@Api(tags = "璁惧淇濆吇")
@RestController
@RequestMapping("/device/maintenance")
public class DeviceMaintenanceController {
@@ -33,8 +35,8 @@
@PostMapping()
@ApiModelProperty("娣诲姞璁惧淇濆吇")
- public AjaxResult add(@RequestBody DeviceMaintenance deviceRepair) {
- return deviceMaintenanceService.saveDeviceRepair(deviceRepair);
+ public AjaxResult add(@RequestBody DeviceMaintenance deviceMaintenance) {
+ return deviceMaintenanceService.saveDeviceRepair(deviceMaintenance);
}
@ApiModelProperty("鏍规嵁id鏌ヨ璁惧淇濆吇")
@@ -46,20 +48,21 @@
@PutMapping ()
@ApiModelProperty("淇敼璁惧淇濆吇")
public AjaxResult update(@RequestBody DeviceMaintenance deviceMaintenance) {
- return deviceMaintenanceService.updateDeviceRepair(deviceMaintenance);
+ return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
}
@PostMapping ("maintenance")
@ApiModelProperty("淇敼璁惧淇濆吇")
public AjaxResult maintenance(@RequestBody DeviceMaintenance deviceMaintenance) {
- return deviceMaintenanceService.updateDeviceRepair(deviceMaintenance);
+ deviceMaintenance.setStatus(1);
+ return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
}
- @DeleteMapping("/{id}")
+ @DeleteMapping("/{ida}")
@ApiModelProperty("鍒犻櫎璁惧淇濆吇")
- public AjaxResult delete(@PathVariable ArrayList<Long> ids) {
- boolean b = deviceMaintenanceService.removeBatchByIds(ids);
+ public AjaxResult delete(@PathVariable("ids") Long[] ids) {
+ boolean b = deviceMaintenanceService.removeBatchByIds(Arrays.asList(ids));
if (!b) {
return AjaxResult.error("鍒犻櫎澶辫触");
}
--
Gitblit v1.9.3