From c6ef8fb06f8f75ece7e4d6669af01bebb051d217 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 03 六月 2023 17:20:56 +0800
Subject: [PATCH] 优化巡检
---
ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 530f3fb..61ef513 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
@@ -1,5 +1,6 @@
package com.ruoyi.inspect.service.impl;
+import com.ruoyi.constant.Global;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.hiksdk.common.GlobalVariable;
import com.ruoyi.device.hiksdk.service.IHikClientService;
@@ -53,7 +54,21 @@
ardVideoInspectTask.setCurrentStepId("");
ardVideoInspectTask.setCurrentStepStartTime("");
ardVideoInspectTaskMapper.updateArdVideoInspectTask(ardVideoInspectTask);
-
+ /*灏嗗叧鑱旂殑鐩告満褰曞儚鍏抽棴*/
+ if( Global.task_record.contains(taskId))
+ {
+// Integer userId = GlobalVariable.loginMap.get(ardVideoInspectTask.getCameraId());//鑾峰彇褰撳墠鐩告満鐨勭櫥褰旾D
+// if( GlobalVariable.user_real_Map.containsKey(userId))
+// { //褰撳墠鐩告満姝ｅ湪褰曞儚锛屽垯鍋滄褰曞儚
+// CameraCmd cmd = new CameraCmd();
+// cmd.setCameraId(ardVideoInspectTask.getCameraId());
+// cmd.setChannelNum(ardVideoInspectTask.getChannel());
+// cmd.setEnable(false);//鍋滄褰曞儚
+// cmd.setUploadMinio(false);
+// hikClientService.recordToMinio(cmd);
+// }
+ Global.task_record.remove(taskId);
+ }
InspectionTask task = new InspectionTask(taskId);
task.start();
taskMap.put(taskId, task);
@@ -74,7 +89,9 @@
cmd.setCameraId(ardVideoInspectTask.getCameraId());
cmd.setChannelNum(ardVideoInspectTask.getChannel());
cmd.setEnable(false);//鍋滄褰曞儚
+ cmd.setUploadMinio(false);
hikClientService.recordToMinio(cmd);
+ GlobalVariable.user_real_Map.remove(userId);
}
InspectionTask task = taskMap.get(taskId);
if (task != null) {
--
Gitblit v1.9.3