From c4c6484a6e6d18e56ec6791db3585aae39c8584d Mon Sep 17 00:00:00 2001
From: zhangjian <zhangjianrock@163.com>
Date: 星期五, 02 六月 2023 09:13:46 +0800
Subject: [PATCH] 视频巡检任务 单独更新
---
ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java
index 377500d..9ee0e03 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java
@@ -15,7 +15,7 @@
import java.util.Map;
/**
- * @Description:
+ * @Description: 宸℃浠诲姟绠＄悊
* @ClassName: InspectionTaskManager
* @Author: 鍒樿嫃涔�
* @Date: 2023骞�06鏈�01鏃�10:40
@@ -31,7 +31,7 @@
@Resource
private IHikClientService hikClientService;
- public static Map<String, InspectionTask> taskMap;
+ public static Map<String, InspectionTask> taskMap;//宸插惎鍔ㄤ换鍔ap
public InspectionTaskManager() {
taskMap = new HashMap<>();
@@ -41,7 +41,14 @@
return taskMap;
}
+ /*鍚姩浠诲姟*/
public void startInspectionTask(String taskId) {
+ if(taskMap.containsKey(taskId))
+ {
+ log.info("宸℃浠诲姟宸插惎鍔細" + taskId);
+ return;
+ }
+ /*姣忔鍚姩浠诲姟娓呯┖浠诲姟褰撳墠姝ラ淇℃伅*/
ArdVideoInspectTask ardVideoInspectTask = ardVideoInspectTaskMapper.selectArdVideoInspectTaskById(taskId);
ardVideoInspectTask.setCurrentStepId("");
ardVideoInspectTask.setCurrentStepStartTime("");
@@ -50,15 +57,16 @@
InspectionTask task = new InspectionTask(taskId);
task.start();
taskMap.put(taskId, task);
- log.info("宸℃浠诲姟宸插惎鍔細" + taskId);
+ log.info("宸℃浠诲姟鍚姩锛�" + taskId);
}
-
+ /*鍋滄浠诲姟*/
public void stopInspectionTask(String taskId) {
+ /*灏嗕换鍔℃楠や俊鎭竻绌�*/
ArdVideoInspectTask ardVideoInspectTask = ardVideoInspectTaskMapper.selectArdVideoInspectTaskById(taskId);
ardVideoInspectTask.setCurrentStepId("");
ardVideoInspectTask.setCurrentStepStartTime("");
ardVideoInspectTaskMapper.updateArdVideoInspectTask(ardVideoInspectTask);
-
+ /*灏嗗叧鑱旂殑鐩告満褰曞儚鍏抽棴*/
Integer userId = GlobalVariable.loginMap.get(ardVideoInspectTask.getCameraId());//鑾峰彇褰撳墠鐩告満鐨勭櫥褰旾D
if( GlobalVariable.user_real_Map.containsKey(userId))
{ //褰撳墠鐩告満姝ｅ湪褰曞儚锛屽垯鍋滄褰曞儚
@@ -66,6 +74,7 @@
cmd.setCameraId(ardVideoInspectTask.getCameraId());
cmd.setChannelNum(ardVideoInspectTask.getChannel());
cmd.setEnable(false);//鍋滄褰曞儚
+ cmd.setUploadMinio(false);
hikClientService.recordToMinio(cmd);
}
InspectionTask task = taskMap.get(taskId);
--
Gitblit v1.9.3