From a64774b3898c4ce8e7d3aa0ccc3c4ee92861d2a6 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 21 五月 2026 15:03:51 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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..76fefc3 100644
--- a/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java
+++ b/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java
@@ -6,9 +6,9 @@
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 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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -19,7 +19,7 @@
* @author :yys
* @date : 2025/12/22 14:58
*/
-@Api(tags = "璁惧淇濆吇瀹氭椂浠诲姟绠＄悊")
+@Tag(name = "璁惧淇濆吇瀹氭椂浠诲姟绠＄悊")
@RestController
@RequestMapping("/deviceMaintenanceTask")
@AllArgsConstructor
@@ -30,30 +30,30 @@
@GetMapping("/listPage")
- @ApiOperation(value = "璁惧淇濆吇瀹氭椂浠诲姟鍒楄〃")
- public AjaxResult listPage(Page page, MaintenanceTask maintenanceTask) {
+ @Operation(summary = "璁惧淇濆吇瀹氭椂浠诲姟鍒楄〃")
+ public R<?> listPage(Page page, MaintenanceTask maintenanceTask) {
return maintenanceTaskService.listPage(page,maintenanceTask);
}
@PostMapping("/add")
- @ApiOperation(value = "娣诲姞璁惧淇濆吇瀹氭椂浠诲姟")
+ @Operation(summary = "娣诲姞璁惧淇濆吇瀹氭椂浠诲姟")
@Log(title = "璁惧淇濆吇瀹氭椂浠诲姟", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody MaintenanceTask maintenanceTask) {
+ public R<?> 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) {
+ public R<?> 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) {
+ public R<?> delete(@RequestBody List<Long> ids) {
return maintenanceTaskService.delete(ids);
}
--
Gitblit v1.9.3