From 1100a88fb4ddf156efc5a7695f91caae0859df94 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 29 一月 2024 10:36:17 +0800
Subject: [PATCH] pc端查看三一车辆位置申请提交
---
ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java b/ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java
index 5fb815a..955d788 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java
@@ -2,6 +2,7 @@
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.inspect.service.IArdVideoInspectTaskService;
import com.ruoyi.inspect.service.impl.InspectionTaskManager;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -26,14 +27,42 @@
public class TaskController {
@Autowired
private InspectionTaskManager inspectionTaskManager;
-
+ @Autowired
+ IArdVideoInspectTaskService ardVideoInspectTaskService;
@PreAuthorize("@ss.hasPermi('inspect:control:manual')")
@GetMapping("/startTask/{taskId}")
@ApiOperation("鎵嬪姩寮�鍚贰妫�")
AjaxResult startTask(@PathVariable String taskId) {
- // 寮�鍚贰妫�浠诲姟
- inspectionTaskManager.startInspectionTask(taskId);
- return AjaxResult.success();
+ boolean enablemanualTask = ardVideoInspectTaskService.isEnablemanualTask(taskId);
+ if (enablemanualTask)
+ {
+ // 寮�鍚贰妫�浠诲姟
+ inspectionTaskManager.startInspectionTask(taskId);
+ return AjaxResult.success();
+ }
+ else
+ {
+ return AjaxResult.error();
+ }
+
+ }
+
+
+ @GetMapping("/startTask/{taskId}/noPerm")
+ @ApiOperation("鎵嬪姩寮�鍚贰妫�-涓嶆牎楠屾潈闄�")
+ AjaxResult startTaskNoPerm(@PathVariable String taskId) {
+ boolean enablemanualTask = ardVideoInspectTaskService.isEnablemanualTask(taskId);
+ if (enablemanualTask)
+ {
+ // 寮�鍚贰妫�浠诲姟
+ inspectionTaskManager.startInspectionTask(taskId);
+ return AjaxResult.success();
+ }
+ else
+ {
+ return AjaxResult.error();
+ }
+
}
@PreAuthorize("@ss.hasPermi('inspect:control:manual')")
@@ -44,6 +73,15 @@
inspectionTaskManager.stopInspectionTask(taskId);
return AjaxResult.success();
}
+
+ @ApiOperation("鎵嬪姩鍋滄宸℃-涓嶆牎楠屾潈闄�")
+ @GetMapping("/stopTask/{taskId}/noPerm")
+ AjaxResult stopTaskNoPerm(@PathVariable String taskId) {
+ // 鍋滄宸℃浠诲姟
+ inspectionTaskManager.stopInspectionTask(taskId);
+ return AjaxResult.success();
+ }
+
@PreAuthorize("@ss.hasPermi('inspect:control:manual')")
@ApiOperation("鏌ヨ宸插惎鍔ㄤ换鍔�")
@GetMapping("/getTaskList")
@@ -52,4 +90,12 @@
Set<String> taskIds = inspectionTaskManager.getTaskMap().keySet();
return AjaxResult.success(taskIds);
}
+
+ @ApiOperation("鏌ヨ宸插惎鍔ㄤ换鍔�-涓嶆牎楠屾潈闄�")
+ @GetMapping("/getTaskList/noPerm")
+ AjaxResult getTaskListNoPerm() {
+ // 鍋滄宸℃浠诲姟
+ Set<String> taskIds = inspectionTaskManager.getTaskMap().keySet();
+ return AjaxResult.success(taskIds);
+ }
}
--
Gitblit v1.9.3