From b08492fcb6706124bef6e86cd6914c8eba54599a Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 02 二月 2024 16:14:18 +0800
Subject: [PATCH] 三一车辆追踪加入启动即推送提交
---
ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 9 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 27cf26f..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
@@ -1,8 +1,7 @@
package com.ruoyi.inspect.controller;
-import com.ruoyi.common.annotation.Anonymous;
+
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.inspect.domain.ArdVideoInspectTask;
import com.ruoyi.inspect.service.IArdVideoInspectTaskService;
import com.ruoyi.inspect.service.impl.InspectionTaskManager;
import io.swagger.annotations.Api;
@@ -13,12 +12,10 @@
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
import java.util.Set;
/**
- * @Description: 宸℃浠诲姟
+ * @Description: 宸℃浠诲姟controller
* @ClassName: TaskController
* @Author: 鍒樿嫃涔�
* @Date: 2023骞�06鏈�01鏃�9:19
@@ -30,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')")
@@ -48,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")
@@ -56,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