From 43f46c3801b0aa8544a1703e4f1a27ecc8db22b8 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 13 一月 2024 16:17:51 +0800
Subject: [PATCH] 修改生产配置文件和无人机日志
---
ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java
index 306fb1c..de60871 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java
@@ -217,7 +217,14 @@
ardChannelService.insertArdChannel(channel);
}
//閰嶇疆鍒版祦濯掍綋
- for (int i = 1; i < m_stDeviceInfo.byChanNum + 1; i++) {
+ addVtdu(camera);
+ //鍒涘缓寮曞闃熷垪
+ createGuideQueue(camera);
+ }
+
+ //娣诲姞鍒版祦濯掍綋
+ private void addVtdu(ArdCameras camera) {
+ for (int i = 1; i < camera.getChanNum() + 1; i++) {
String name = camera.getId() + "_" + i;
String rtspSource = "rtsp://" + camera.getUsername() + ":" + camera.getPassword() + "@" + camera.getIp() + ":" + camera.getRtspPort() + "/cam/realmonitor?channel=" + i + "&subtype=0";
Vtdu vtdu = vtduService.selectVtduByName(name);
@@ -243,16 +250,20 @@
vtdu.setCameraId(camera.getId());
vtduService.insertVtdu(vtdu);
}
+ }
- //鍒涘缓寮曞闃熷垪
- if (camera.getCamAlarmGuideEnable() == 1) {
- if (!GuidePriorityQueue.cameraQueueMap.containsKey(camera.getId())) {
- Comparator<GuideTask> comparator = GuidePriorityQueue.getComparator();
- PriorityBlockingQueue<GuideTask> priorityQueue = new PriorityBlockingQueue<>(1000, comparator);
- GuidePriorityQueue.cameraQueueMap.put(camera.getId(), priorityQueue);
+ //鍒涘缓寮曞闃熷垪
+ private void createGuideQueue(ArdCameras camera) {
+ if (camera.getCamAlarmGuideEnable() != null) {
+ if (camera.getCamAlarmGuideEnable() == 1) {
+ if (!GuidePriorityQueue.cameraQueueMap.containsKey(camera.getId())) {
+ Comparator<GuideTask> comparator = GuidePriorityQueue.getComparator();
+ PriorityBlockingQueue<GuideTask> priorityQueue = new PriorityBlockingQueue<>(1000, comparator);
+ GuidePriorityQueue.cameraQueueMap.put(camera.getId(), priorityQueue);
+ //鍚姩闃熷垪澶勭悊鍣�
+ queueHandler.process(camera.getId());
+ }
}
- //鍚姩闃熷垪澶勭悊鍣�
- queueHandler.process(camera.getId());
}
}
@@ -413,6 +424,11 @@
@Override
public Map<String, Object> getPtzScope(CameraCmd cmd) {
return null;
+ }
+
+ @Override
+ public boolean setPtz1(CameraCmd cmd) {
+ return false;
}
/**
@@ -1072,4 +1088,4 @@
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3