From da6b322fb0b3e80ad8bb3e0f5bdbf9e5113dbb5e Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 20 十月 2026 15:22:30 +0800
Subject: [PATCH] feat: 设备保养优化,保养项目拆分
---
src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java | 45 ++++++++++++++++++++++++---------------------
1 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java b/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java
index 0616e50..246498a 100644
--- a/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java
+++ b/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java
@@ -2,60 +2,63 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.pojo.MaintenanceTask;
+import com.ruoyi.device.service.MaintenanceItemService;
import com.ruoyi.device.service.MaintenanceTaskService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
import java.util.List;
-/**
- * @author :yys
- * @date : 2025/12/22 14:58
- */
-@Api(tags = "璁惧淇濆吇瀹氭椂浠诲姟绠＄悊")
+@Tag(name = "璁惧淇濆吇瀹氭椂浠诲姟绠＄悊")
@RestController
@RequestMapping("/deviceMaintenanceTask")
-@AllArgsConstructor
+@RequiredArgsConstructor
public class MaintenanceTaskController extends BaseController {
-
- private MaintenanceTaskService maintenanceTaskService;
-
+ private final MaintenanceTaskService maintenanceTaskService;
+ private final MaintenanceItemService maintenanceItemService;
@GetMapping("/listPage")
- @ApiOperation(value = "璁惧淇濆吇瀹氭椂浠诲姟鍒楄〃")
+ @Operation(summary = "璁惧淇濆吇瀹氭椂浠诲姟鍒楄〃")
public AjaxResult listPage(Page page, MaintenanceTask maintenanceTask) {
- return maintenanceTaskService.listPage(page,maintenanceTask);
+ return maintenanceTaskService.listPage(page, maintenanceTask);
}
-
@PostMapping("/add")
- @ApiOperation(value = "娣诲姞璁惧淇濆吇瀹氭椂浠诲姟")
+ @Operation(summary = "娣诲姞璁惧淇濆吇瀹氭椂浠诲姟")
@Log(title = "璁惧淇濆吇瀹氭椂浠诲姟", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody MaintenanceTask maintenanceTask) {
return maintenanceTaskService.add(maintenanceTask);
}
@PostMapping("/update")
- @ApiOperation(value = "淇敼璁惧淇濆吇瀹氭椂浠诲姟")
+ @Operation(summary = "淇敼璁惧淇濆吇瀹氭椂浠诲姟")
@Log(title = "璁惧淇濆吇瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody MaintenanceTask maintenanceTask) {
return maintenanceTaskService.updateByMaintenanceTaskId(maintenanceTask);
}
@DeleteMapping("/delete")
- @ApiOperation(value = "鍒犻櫎璁惧淇濆吇瀹氭椂浠诲姟")
+ @Operation(summary = "鍒犻櫎璁惧淇濆吇瀹氭椂浠诲姟")
@Log(title = "璁惧淇濆吇瀹氭椂浠诲姟", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
return maintenanceTaskService.delete(ids);
}
-
+ @GetMapping("/items")
+ @Operation(summary = "鍚敤鐨勮澶囦繚鍏婚」鐩�")
+ public AjaxResult items() {
+ return AjaxResult.success(maintenanceItemService.listActive());
+ }
}
--
Gitblit v1.9.3