From ffbead22a45b907130c496883890470b5413f098 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期三, 13 三月 2024 09:19:19 +0800
Subject: [PATCH] app光电查询当前通道提交
---
ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 b7810a5..31bd49f 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
@@ -455,6 +455,10 @@
}
LLong loginId = (LLong) GlobalVariable.loginMap.get(cameraId);
try {
+ if(ptz.get("p")==null||ptz.get("t")==null||ptz.get("z")==null)
+ {
+ return AjaxResult.error("ptz鍙傛暟涓嶈兘涓虹┖");
+ }
int p = (int) (ptz.get("p") * 10);
int t = (int) (ptz.get("t") * 10);
t = t > 900 ? 3600 - t : t * -1;
@@ -527,7 +531,7 @@
@Override
public Map<String, Object> getPtz1(CameraCmd cmd) {
- return null;
+ return getPtz(cmd);
}
/**
@@ -690,7 +694,7 @@
try {
ArdCameras cameras = ardCamerasService.selectArdCamerasById(cameraId);
double[] cameraPositon = new double[]{cameras.getLongitude(), cameras.getLatitude(), cameras.getAltitude()};
- double[] targetPositions = new double[]{cmd.getTargetPosition().getLongitude(),cmd.getTargetPosition().getLatitude()};
+ double[] targetPositions = cmd.getTargetPosition();
double[] cameraPTZ = GisUtil.getCameraPTZ(cameraPositon, targetPositions, 20, 150);
int p = (int) (cameraPTZ[0] * 10);
int t = (int) (cameraPTZ[1] * 10);
--
Gitblit v1.9.3