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 |   68 +++++++++++++++++++++++++++++-----
 1 files changed, 58 insertions(+), 10 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 faf8110..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,22 +1,21 @@
 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;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 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
@@ -24,18 +23,49 @@
  **/
 @RestController
 @Api(tags = "宸℃浠诲姟")
-@Anonymous
+@RequestMapping("/inspect/control")
 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')")
     @ApiOperation("鎵嬪姩鍋滄宸℃")
     @GetMapping("/stopTask/{taskId}")
     AjaxResult stopTask(@PathVariable String taskId) {
@@ -43,6 +73,16 @@
         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")
     AjaxResult getTaskList() {
@@ -50,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