From af3b68eeca07a30967754dc1a61b8def9efe188c Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 14 十二月 2023 11:59:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueTaskExecutor.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 fd48181..ff9980c 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
@@ -20,16 +20,17 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
/**
* @ClassName QueueTaskExecutor
- * @Description: 闃熷垪浠诲姟鎵ц鍣�
+ * @Description: 闃熷垪浠诲姟鎵ц鍣�-----寮冪敤
* @Author 鍒樿嫃涔�
* @Date 2023/6/29 21:10
* @Version 1.0
*/
-@Component
@Slf4j(topic = "guideQueue")
public class QueueTaskExecutor {
@Resource
@@ -42,7 +43,6 @@
ICameraSdkService cameraSdkService;
@Resource
IArdAlarmTubeService ardAlarmTubeService;
-
@Resource
IArdAlarmExternalService ardAlarmExternalService;
@Resource
@@ -57,6 +57,11 @@
cmd.setOperator(guideTask.getAlarmType());
cmd.setExpired(30);
cmd.setRecordBucketName("record");
+ Map<String, Double> ptzMap = new HashMap<>();
+ ptzMap.put("p", guideTask.getGuidePTZ().getP());
+ ptzMap.put("t", guideTask.getGuidePTZ().getT());
+ ptzMap.put("z", guideTask.getGuidePTZ().getZ());
+ cmd.setPtzMap(ptzMap);
if (guideTask.getRecordSn().equals(1)) {
cmd.setRecordObjectName("alarm_" + guideTask.getAlarmId() + "_1");
} else {
@@ -64,7 +69,13 @@
}
log.debug("寮�濮嬪紩瀵�");
- boolean guideRes = cameraSdkService.guideTargetPosition(cmd);
+ boolean guideRes = false;
+ if (cmd.getPtzMap().get("p") != null) {
+ //p鍊煎瓨鍦� 浼樺厛寮曞ptz
+ guideRes = cameraSdkService.setPtz(cmd);
+ } else {
+ guideRes = cameraSdkService.guideTargetPosition(cmd);
+ }
if (guideRes) {
log.debug("寮曞鎴愬姛");
cameraSdkService.controlLock(cmd);//涓婇攣
@@ -132,4 +143,4 @@
log.info("绾跨▼浠诲姟寮傚父:" + ex.getMessage());
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3