From 879f0f4ab74d6d6ee147ea41648b35d368045e6c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 07 七月 2023 10:32:02 +0800
Subject: [PATCH] 修改雷达管理业务 修改相机复选框接口状态
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java
index 3f43366..ecae683 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/QueueTaskExecutor.java
@@ -10,7 +10,6 @@
import com.ruoyi.device.hiksdk.service.IHikClientService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
-
import javax.annotation.Resource;
/**
@@ -22,7 +21,7 @@
*/
@Component
-@Slf4j
+@Slf4j(topic = "guideQueue")
public class QueueTaskExecutor {
@Resource
IHikClientService hikClientService;
@@ -35,16 +34,24 @@
try {
CameraCmd cmd = new CameraCmd();
cmd.setCameraId(guideTask.getCameraId());
- cmd.setChannelNum(guideTask.getNum());
+ cmd.setChannelNum(guideTask.getChanNum());
+ cmd.setTargetPosition(guideTask.getTargetPosition());
+ cmd.setOperator(guideTask.getAlarmType());
+ cmd.setExpired(30);
+ cmd.setRecordBucketName("record");
+ cmd.setRecordObjectName("alarm_"+guideTask.getAlarmId());
+ log.debug("寮�濮嬪紩瀵�");
boolean guideRes = hikClientService.guideTargetPosition(cmd);
if (guideRes) {
+ log.debug("寮曞鎴愬姛");
hikClientService.controlLock(cmd);//涓婇攣
- cmd.setEnable(true);//寮�濮嬪綍鍍�
- hikClientService.recordToMinio(cmd);//寮�濮嬪綍鍍�
- Thread.sleep(30000);
- cmd.setEnable(false);//鍋滄褰曞儚
- cmd.setUploadMinio(true);//涓婁紶minio
- String url = hikClientService.recordToMinio(cmd);//鍋滄褰曞儚杩斿洖url
+ hikClientService.recordStart(cmd);//寮�濮嬪綍鍍�
+ try {
+ Thread.sleep(30000);
+ } catch (InterruptedException e) {
+ log.info("褰撳墠浠诲姟ID"+guideTask.getAlarmId()+"绾跨▼琚粓姝�");
+ }
+ String url = hikClientService.recordStopToMinio(cmd);//鍋滄褰曞儚杩斿洖url
if (StringUtils.isNotEmpty(url)) {
switch (guideTask.getAlarmType()) {
case "sys_tube_leak":
@@ -54,17 +61,9 @@
ardAlarmTubeService.updateArdAlarmTube(ardAlarmTube);
break;
case "sys_radar_move":
- ArdAlarmRadar ardAlarmRadar = new ArdAlarmRadar();
- ardAlarmRadar.setId(guideTask.getAlarmId());
- if (guideTask.getRecordSn().equals(1)) {
- ardAlarmRadar.setRecordUrl1(url);
- } else {
- ardAlarmRadar.setRecordUrl2(url);
- }
- ardAlarmRadarService.updateArdAlarmRadar(ardAlarmRadar);
- break;
case "sys_radar_fire":
- ardAlarmRadar = new ArdAlarmRadar();
+ case "sys_radar_pumpshutdown":
+ ArdAlarmRadar ardAlarmRadar = new ArdAlarmRadar();
ardAlarmRadar.setId(guideTask.getAlarmId());
if (guideTask.getRecordSn().equals(1)) {
ardAlarmRadar.setRecordUrl1(url);
@@ -77,7 +76,7 @@
}
}
} catch (Exception ex) {
- log.info("鑷姩寮曞寮傚父:" + ex.getMessage());
+ log.info("绾跨▼浠诲姟寮傚父:" + ex.getMessage());
}
}
}
--
Gitblit v1.9.3