From 4f55d3cb4bc644e4534106336f2047af1a4db5df Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 29 五月 2026 18:09:46 +0800
Subject: [PATCH] feat(config): 添加新环境配置并扩展设备台账功能
---
src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 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..7fc021c 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/TimingTaskController.java
@@ -7,35 +7,37 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.inspectiontask.dto.InspectionTaskDto;
import com.ruoyi.inspectiontask.dto.TimingTaskDto;
+import com.ruoyi.inspectiontask.pojo.InspectionTask;
import com.ruoyi.inspectiontask.pojo.TimingTask;
+import com.ruoyi.inspectiontask.service.InspectionTaskService;
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;
+ private InspectionTaskService inspectionTaskService;
/**
* 瀹氭椂宸℃浠诲姟琛ㄦ煡璇�
*/
@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 +47,7 @@
* 瀵煎嚭
*/
@PostMapping("/export")
- @ApiOperation(value = "瀵煎嚭瀹氭椂浠诲姟")
+ @Operation(summary = "瀵煎嚭瀹氭椂浠诲姟")
public void export(HttpServletResponse response) {
Page page = new Page<>(-1,-1);
TimingTaskDto timingTask = new TimingTaskDto();
@@ -58,17 +60,37 @@
* 瀹氭椂宸℃浠诲姟琛ㄦ柊澧炰慨鏀�
*/
@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));
}
/**
+ * 淇敼鍚敤鐘舵��
+ */
+ @PostMapping("/changeEnable")
+ @Operation(summary = "鍚敤鎴栫鐢ㄥ畾鏃朵换鍔�")
+ @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
+ public R changeEnable(@RequestBody TimingTask timingTask) throws SchedulerException {
+ return R.ok(timingTaskService.changeEnable(timingTask.getId(), timingTask.getIsEnabled()));
+ }
+
+ /**
+ * 褰撴棩宸℃璁板綍
+ */
+ @GetMapping("/recordList/{timingId}")
+ @Operation(summary = "鎸夊畾鏃朵换鍔℃煡璇㈠贰妫�璁板綍")
+ public R<IPage<InspectionTaskDto>> recordList(Page<InspectionTask> page, @PathVariable Long timingId) {
+ IPage<InspectionTaskDto> list = inspectionTaskService.selectInspectionTaskRecordList(page, timingId);
+ return R.ok(list);
+ }
+
+ /**
* 瀹氭椂宸℃浠诲姟琛ㄥ垹闄�
*/
@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