From 48af67d016ceca5d8bd598c478b70c54ed099bf0 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Tue, 12 Mar 2024 11:25:07 +0800
Subject: [PATCH] 大华设备增加getPTZ
---
ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadar.java | 16 +++++++++++++---
ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java | 1 +
ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java | 6 +++++-
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadar.java b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadar.java
index 7332a52..fad378c 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadar.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/radar/domain/ArdAlarmRadar.java
@@ -9,7 +9,7 @@
/**
* 雷达报警对象 ard_alarm_radar
- *
+ *
* @author ard
* @date 2023-06-28
*/
@@ -58,7 +58,14 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "查看时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date viewTime;
-
+ /**
+ * 雷达ID
+ */
+ private String RadarId;
+ /**
+ * 井号
+ */
+ private String wellId;
/**
* 报警总数
@@ -80,5 +87,8 @@
* 录像url2
*/
private String recordUrl2;
-
+ /** 引导时间 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "引导时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date guideTime;
}
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 84407f2..bebca46 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
@@ -72,6 +72,7 @@
String picCutCate(CameraCmd cmd);
//ptz 三坐标
Map<String, Object> getPtz1(CameraCmd cmd);
+
//ptz 三坐标 高精度PTZ
Map<String, Object> getPtz(CameraCmd cmd);
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 29ef39c..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);
}
/**
--
Gitblit v1.9.3