From bfc38cacac67f1bf2a5e857865d64cd49dc8175e Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 21 六月 2023 15:53:44 +0800
Subject: [PATCH] 增加通用光电报警接收 增加报警类型配置
---
ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java | 21 +++------------------
1 files changed, 3 insertions(+), 18 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 f427cfd..b56f6f3 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,14 +1,11 @@
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;
-import com.ruoyi.device.hiksdk.service.impl.HikClientServiceImpl;
import com.ruoyi.inspect.domain.ArdVideoInspectTask;
import com.ruoyi.inspect.mapper.ArdVideoInspectTaskMapper;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -50,12 +47,8 @@
log.info("鎵嬪姩宸℃浠诲姟宸插惎鍔細" + taskId);
return;
}
-// /*姣忔鍚姩浠诲姟娓呯┖浠诲姟褰撳墠姝ラ淇℃伅*/
+ /*姣忔鍚姩浠诲姟娓呯┖浠诲姟褰撳墠姝ラ淇℃伅*/
ArdVideoInspectTask ardVideoInspectTask = ardVideoInspectTaskMapper.selectArdVideoInspectTaskById(taskId);
-// ardVideoInspectTask.setCurrentStepId("");
-// ardVideoInspectTask.setCurrentStepStartTime("");
-// ardVideoInspectTaskMapper.updateArdVideoInspectTask(ardVideoInspectTask);
-
String cameraId = ardVideoInspectTask.getCameraId();
/*灏嗗綋鍓嶇浉鏈虹殑鎵�鏈変换鍔″綋鍓嶆椂闂寸疆绌�*/
ardVideoInspectTask=new ArdVideoInspectTask();
@@ -65,11 +58,6 @@
for (ArdVideoInspectTask VideoInspectTask : ardVideoInspectTasks) {
VideoInspectTask.setCurrentStepStartTime("");
ardVideoInspectTaskMapper.updateArdVideoInspectTaskWithCurrentSetpInfo(VideoInspectTask);
- /*娓呮浠诲姟褰曞儚璁板綍*/
- if(Global.task_record.contains(VideoInspectTask.getId()))
- {
- Global.task_record.remove(VideoInspectTask.getId());
- }
}
}
/*寮�鍚换鍔�*/
@@ -84,8 +72,7 @@
ArdVideoInspectTask ardVideoInspectTask = ardVideoInspectTaskMapper.selectArdVideoInspectTaskById(taskId);
/*灏嗗叧鑱旂殑鐩告満褰曞儚鍏抽棴*/
String cameraId = ardVideoInspectTask.getCameraId();
- Integer userId = GlobalVariable.loginMap.get(cameraId);//鑾峰彇褰撳墠鐩告満鐨勭櫥褰旾D
- if( GlobalVariable.user_real_Map.containsKey(userId))
+ if( GlobalVariable.previewMap.containsKey(cameraId))
{ //褰撳墠鐩告満姝ｅ湪褰曞儚锛屽垯鍋滄褰曞儚
CameraCmd cmd = new CameraCmd();
cmd.setCameraId(ardVideoInspectTask.getCameraId());
@@ -93,15 +80,13 @@
cmd.setEnable(false);//鍋滄褰曞儚
cmd.setUploadMinio(false);
hikClientService.recordToMinio(cmd);
- GlobalVariable.user_real_Map.remove(userId);
+ GlobalVariable.previewMap.remove(cameraId);
}
-
/*鍋滄浠诲姟*/
InspectionTask task = taskMap.get(taskId);
if (task != null) {
task.stop();
taskMap.remove(taskId);
- Global.task_record.remove(taskId);
log.info("鎵嬪姩宸℃浠诲姟宸插仠姝細" + taskId);
/*灏嗕换鍔℃楠や俊鎭竻绌�*/
ardVideoInspectTask.setCurrentStepId("");
--
Gitblit v1.9.3