From 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 16:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java b/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java
index 78884ad..ad2e338 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java
@@ -10,32 +10,30 @@
import com.ruoyi.inspectiontask.dto.TimingTaskDto;
import com.ruoyi.inspectiontask.pojo.TimingTask;
import com.ruoyi.inspectiontask.service.TimingTaskService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.quartz.SchedulerException;
+import org.springframework.web.bind.annotation.*;
/**
* @author :yys
* @date : 2025/9/19 10:53
*/
@RestController
-@Api(tags = "宸℃绠＄悊")
+@Tag(name = "宸℃绠＄悊")
@RequestMapping("/timingTask")
+@AllArgsConstructor
public class TimingTaskController extends BaseController {
-
- @Autowired
private TimingTaskService timingTaskService;
/**
* 瀹氭椂宸℃浠诲姟琛ㄦ煡璇�
*/
@GetMapping("/list")
- @ApiOperation(value = "瀹氭椂浠诲姟鍒楄〃")
+ @Operation(summary = "瀹氭椂浠诲姟鍒楄〃")
public R<IPage<TimingTaskDto>> list(Page<TimingTask> page, TimingTask timingTask) {
IPage<TimingTaskDto> list = timingTaskService.selectTimingTaskList(page,timingTask);
return R.ok(list);
@@ -45,7 +43,7 @@
* 瀵煎嚭
*/
@PostMapping("/export")
- @ApiOperation(value = "瀵煎嚭瀹氭椂浠诲姟")
+ @Operation(summary = "瀵煎嚭瀹氭椂浠诲姟")
public void export(HttpServletResponse response) {
Page page = new Page<>(-1,-1);
TimingTaskDto timingTask = new TimingTaskDto();
@@ -58,7 +56,7 @@
* 瀹氭椂宸℃浠诲姟琛ㄦ柊澧炰慨鏀�
*/
@PostMapping("/addOrEditTimingTask")
- @ApiOperation(value = "鏂板淇敼瀹氭椂浠诲姟")
+ @Operation(summary = "鏂板淇敼瀹氭椂浠诲姟")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.INSERT)
public R addOrEditTimingTask(@RequestBody TimingTaskDto timingTaskDto) throws SchedulerException {
return R.ok(timingTaskService.addOrEditTimingTask(timingTaskDto));
@@ -68,7 +66,7 @@
* 瀹氭椂宸℃浠诲姟琛ㄥ垹闄�
*/
@DeleteMapping("/delTimingTask")
- @ApiOperation(value = "鍒犻櫎瀹氭椂浠诲姟")
+ @Operation(summary = "鍒犻櫎瀹氭椂浠诲姟")
@Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.DELETE)
public R remove(@RequestBody Long[] ids) {
return R.ok(timingTaskService.delByIds(ids));
--
Gitblit v1.9.3