From 454b5a4b87b5c2ffe34f67a53797d6aeb7941995 Mon Sep 17 00:00:00 2001
From: Administrator <ard@qq.com>
Date: Thu, 29 Feb 2024 15:06:40 +0800
Subject: [PATCH] 优化ptz
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java | 9 ++++++++-
ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java | 3 ++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java b/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java
index 6def333..fed0ade 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java
@@ -69,8 +69,9 @@
//抓图
String picCutCate(CameraCmd cmd);
-
//ptz 三坐标
+ Map<String, Object> getPtz1(CameraCmd cmd);
+ //ptz 三坐标 高精度PTZ
Map<String, Object> getPtz(CameraCmd cmd);
//获取ptz范围
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
index 06866e8..b5b4ad5 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
@@ -400,7 +400,14 @@
if (ardCamera != null) {
String factory = ardCamera.getFactory();
CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- map = cameraSDK.getPtz(cmd);
+ String gdtype = ardCamera.getGdtype();
+ if (gdtype.equals("1")) {
+ map = cameraSDK.getPtz(cmd);
+ }
+ else
+ {
+ map = cameraSDK.getPtz1(cmd);
+ }
}
} catch (Exception ex) {
log.error("获取ptz异常：" + ex.getMessage());
--
Gitblit v1.9.3