From a8fa8c5473d8bd4dc509d9f4b0bb370f443d15ad Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 07 十一月 2023 16:23:03 +0800
Subject: [PATCH] 清淤
---
ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DhClientServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DhClientServiceImpl.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DhClientServiceImpl.java
index e2ca633..ccb5b6a 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DhClientServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DhClientServiceImpl.java
@@ -28,6 +28,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
import java.io.*;
import java.text.DecimalFormat;
@@ -295,7 +296,7 @@
if (b) {
DecimalFormat df = new DecimalFormat("0.0");//璁剧疆淇濈暀浣嶆暟
String nPTZPan = df.format((float) dh_ptz_location_info.nPTZPan / 10);
- float t = (float) dh_ptz_location_info.nPTZTilt / 10;
+ 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);
@@ -326,10 +327,9 @@
try {
int p = (int) (ptz.get("p") * 10);
int t = (int) (ptz.get("t") * 10);
- int z = ptz.get("z").intValue();
- if (z == 0) {
- z = 1;
- }
+ t = t > 900 ? 3600 - t : t * -1;
+
+ int z = ptz.get("z").intValue() == 0 ? 1 : ptz.get("z").intValue();
boolean bool = netsdk.CLIENT_DHPTZControlEx(loginId, chanNo - 1, NetSDKLib.NET_EXTPTZ_ControlType.NET_EXTPTZ_EXACTGOTO, p, t, z, 0);
if (!bool) {
log.error("鎺у埗澶辫触,璇风◢鍚庨噸璇�" + getErrorCodePrint());
@@ -896,7 +896,7 @@
// 璁惧鏂嚎鍥炶皟: 褰撹澶囧嚭鐜版柇绾挎椂锛孲DK浼氳皟鐢ㄨ鍑芥暟
private static class DisConnect implements NetSDKLib.fDisConnect {
public void invoke(LLong m_hLoginHandle, String pchDVRIP, int nDVRPort, Pointer dwUser) {
- log.warn("Device[" + pchDVRIP + "] Port[" + nDVRPort + "] DisConnect!");
+ log.warn("Device[" + pchDVRIP + ":" + nDVRPort + "] DisConnect!");
}
}
@@ -904,7 +904,7 @@
private static class HaveReConnect implements NetSDKLib.fHaveReConnect {
@Override
public void invoke(LLong lLoginID, String pchDVRIP, int nDVRPort, Pointer dwUser) {
- log.warn("ReConnect Device[" + pchDVRIP + "] Port[" + nDVRPort + "]");
+ log.warn("ReConnect Device[" + pchDVRIP + ":" + nDVRPort + "]");
}
}
--
Gitblit v1.9.3