From d353fdce7cb957aa0f5d9d51d0ad4205c96e156c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 21 十月 2023 11:57:12 +0800
Subject: [PATCH] 1、流媒体升级1.2.0，修改部分forest接口 2、登录设备判断编码自动配置转码 3、增加sdk聚焦模式切换 4、增加sdk视场角获取并定时上传
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueTaskExecutor.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueTaskExecutor.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueTaskExecutor.java
index 8b0eb56..dfce1a1 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueTaskExecutor.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueTaskExecutor.java
@@ -5,19 +5,17 @@
import com.ruoyi.alarm.external.domain.ArdAlarmExternal;
import com.ruoyi.alarm.external.service.IArdAlarmExternalService;
import com.ruoyi.alarm.global.domain.GuideTask;
-import com.ruoyi.alarm.radar.domain.ArdAlarmRadar;
import com.ruoyi.alarm.radar.domain.ArdAlarmRadarFire;
import com.ruoyi.alarm.radar.domain.ArdAlarmRadarMove;
import com.ruoyi.alarm.radar.domain.ArdAlarmRadarPump;
import com.ruoyi.alarm.radar.service.IArdAlarmRadarFireService;
import com.ruoyi.alarm.radar.service.IArdAlarmRadarMoveService;
import com.ruoyi.alarm.radar.service.IArdAlarmRadarPumpService;
-import com.ruoyi.alarm.radar.service.IArdAlarmRadarService;
import com.ruoyi.alarm.tube.domain.ArdAlarmTube;
import com.ruoyi.alarm.tube.service.IArdAlarmTubeService;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.device.camera.domain.CameraCmd;
-import com.ruoyi.device.hiksdk.service.IHikClientService;
+import com.ruoyi.device.camera.service.ICameraSdkService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -41,7 +39,7 @@
@Resource
IArdAlarmRadarPumpService ardAlarmRadarPumpService;
@Resource
- IHikClientService hikClientService;
+ ICameraSdkService cameraSdkService;
@Resource
IArdAlarmTubeService ardAlarmTubeService;
@@ -49,6 +47,7 @@
IArdAlarmExternalService ardAlarmExternalService;
@Resource
IArdAlarmAccessService ardAlarmAccessService;
+
public void processTask(GuideTask guideTask) {
try {
CameraCmd cmd = new CameraCmd();
@@ -60,17 +59,17 @@
cmd.setRecordBucketName("record");
cmd.setRecordObjectName("alarm_" + guideTask.getAlarmId());
log.debug("寮�濮嬪紩瀵�");
- boolean guideRes = hikClientService.guideTargetPosition(cmd);
+ boolean guideRes = cameraSdkService.guideTargetPosition(cmd);
if (guideRes) {
log.debug("寮曞鎴愬姛");
- hikClientService.controlLock(cmd);//涓婇攣
- hikClientService.recordStart(cmd);//寮�濮嬪綍鍍�
+ cameraSdkService.controlLock(cmd);//涓婇攣
+ cameraSdkService.recordStart(cmd);//寮�濮嬪綍鍍�
try {
Thread.sleep(30000);
} catch (InterruptedException e) {
log.info("褰撳墠浠诲姟ID" + guideTask.getAlarmId() + "绾跨▼琚粓姝�");
}
- String url = hikClientService.recordStopToMinio(cmd);//鍋滄褰曞儚杩斿洖url
+ String url = cameraSdkService.recordStopToMinio(cmd);//鍋滄褰曞儚杩斿洖url
if (StringUtils.isNotEmpty(url)) {
switch (guideTask.getAlarmType()) {
case "sys_tube_leak":
--
Gitblit v1.9.3