From 06a1c6004cef3290089a4b629006088a1a5e87a0 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期六, 22 六月 2024 11:59:07 +0800
Subject: [PATCH] 增加：坐标引导俯仰角度修正
---
ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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 e703e1c..3b57ed3 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
@@ -16,6 +16,7 @@
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.IArdCamerasService;
+import com.ruoyi.device.camera.service.ICameraSdkService;
import com.ruoyi.device.channel.domain.ArdChannel;
import com.ruoyi.device.channel.service.IArdChannelService;
import com.ruoyi.media.domain.Vtdu;
@@ -74,6 +75,9 @@
private IArdChannelService ardChannelService;
@Resource
private IVtduService vtduService;
+
+ @Resource
+ ICameraSdkService cameraSdkService;
@Value("${minio.endpoint}")
private String minioEndPoint;
@Resource
@@ -407,9 +411,9 @@
float t = (float) dh_ptz_location_info.nPTZTilt / 10 * -1;
String nPTZTilt = df.format(t < 0 ? t + 360 : t);
String nPTZZoom = df.format((float) dh_ptz_location_info.nPTZZoom);
- ptzMap.put("p", nPTZPan);
- ptzMap.put("t", nPTZTilt);
- ptzMap.put("z", nPTZZoom);
+ ptzMap.put("p" , nPTZPan);
+ ptzMap.put("t" , nPTZTilt);
+ ptzMap.put("z" , nPTZZoom);
return AjaxResult.success(ptzMap);
}
@@ -587,7 +591,7 @@
// return false;
//}
log.debug("鏈湴褰曞儚寮�濮�");
- return AjaxResult.success("鏈湴褰曞儚寮�濮�", lRealHandle);
+ return AjaxResult.success("鏈湴褰曞儚寮�濮�" , lRealHandle);
} catch (Exception ex) {
log.error("鏈湴褰曞儚寮�濮嬪紓甯�" + ex.getMessage());
return AjaxResult.error("鏈湴褰曞儚寮�濮嬪紓甯�" + ex.getMessage());
@@ -781,8 +785,11 @@
double[] cameraPositon = new double[]{cameras.getLongitude(), cameras.getLatitude(), cameras.getAltitude()};
double[] targetPositions = cmd.getTargetPosition();
double[] cameraPTZ = GisUtil.getCameraPTZ(cameraPositon, targetPositions, 20, 150);
+ //淇淇话
+ double correctPitch = cameraSdkService.correctPitch(cmd);
+ double newt = cameraPTZ[1] + correctPitch;
int p = (int) (cameraPTZ[0] * 10);
- int t = (int) (cameraPTZ[1] * 10);
+ int t = (int) (newt * 10);
int z = (int) (cameraPTZ[2]);
boolean bool = netsdk.CLIENT_DHPTZControlEx(loginId, chanNo - 1, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_EXACTGOTO, p, t, z, 0);
if (!bool) {
@@ -1103,10 +1110,10 @@
int nHeight = cfg_encode_info.stuMainStream[0].stuVideoFormat.nHeight;
String resolution = nWidth + "*" + nHeight;
float nFrameRate = cfg_encode_info.stuMainStream[0].stuVideoFormat.nFrameRate;
- map.put("resolution", resolution);//鍒嗚鲸鐜�
- map.put("videoBitrate", String.valueOf(nBitRate));//姣旂壒鐜�
- map.put("videoEncType", videoEncType);//缂栫爜
- map.put("nFrameRate", String.valueOf(nFrameRate));//甯х巼
+ map.put("resolution" , resolution);//鍒嗚鲸鐜�
+ map.put("videoBitrate" , String.valueOf(nBitRate));//姣旂壒鐜�
+ map.put("videoEncType" , videoEncType);//缂栫爜
+ map.put("nFrameRate" , String.valueOf(nFrameRate));//甯х巼
}
} catch (Exception ex) {
log.error("鍙栫爜娴佸帇缂╁弬鏁板紓甯�:" + ex.getMessage());
@@ -1133,8 +1140,8 @@
float nAngelH = (float) dh_out_ptz_view_range_status.nAngelH / 10;
float nAngelV = (float) dh_out_ptz_view_range_status.nAngelV / 10;
Map<String, Object> map = getPtz(cmd);//鑾峰彇ptz
- map.put("fHorFieldAngle", nAngelH);// 姘村钩瑙嗗満瑙�
- map.put("fVerFieldAngle", nAngelV);// 鍨傜洿瑙嗗満瑙�
+ map.put("fHorFieldAngle" , nAngelH);// 姘村钩瑙嗗満瑙�
+ map.put("fVerFieldAngle" , nAngelV);// 鍨傜洿瑙嗗満瑙�
return AjaxResult.success(map);
} catch (Exception ex) {
log.error("鑾峰彇浜戝彴鍙鍩熷紓甯�" + ex.getMessage());
--
Gitblit v1.9.3