From d353fdce7cb957aa0f5d9d51d0ad4205c96e156c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 21 十月 2023 11:57:12 +0800
Subject: [PATCH] 1、流媒体升级1.2.0,修改部分forest接口 2、登录设备判断编码自动配置转码 3、增加sdk聚焦模式切换 4、增加sdk视场角获取并定时上传

---
 ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java b/ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java
index 712d915..0b67dcb 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java
@@ -2,17 +2,27 @@
 
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.bind.DefaultValue;
 
 import java.util.Map;
 
 @Data
+@NoArgsConstructor
 @ApiModel(description = "sdk鍛戒护瀹炰綋绫�")
 public class CameraCmd {
 
+    public CameraCmd(String cameraId, Integer chanNo) {
+        this.cameraId = cameraId;
+        this.chanNo = chanNo;
+    }
+
+    /*鍛戒护鏍囪瘑*/
+    String cmdType;
     /*鐩告満ID*/
     String cameraId;
     /*鐩告満閫氶亾鍙�*/
-    Integer channelNum;
+    Integer chanNo;
     /*浜戝彴浠g爜*/
     Integer code;
     /*浜戝彴閫熷害*/
@@ -24,14 +34,19 @@
     /*鑱氱劍鍊�*/
     Integer dwFocusPos;
     /*PTZ鍊�*/
-    Map<String,Double>ptzMap;
+    Map<String, Double> ptzMap;
 
-    /*鐩告満缁忕含搴�*/
-    String camPosition;
     /*鐩爣缁忕含搴�*/
-    String targetPosition;
+    double[] targetPosition;
+
     /*褰撳墠鎿嶄綔鑰�*/
     String operator;
-    /*杩囨湡闂撮殧锛堝垎閽燂級*/
+    /*杩囨湡闂撮殧锛堢锛�*/
     Integer expired;
+    /*褰撳墠鎿嶄綔鑰呭悕瀛�*/
+    String operatorZh;
+    /*褰曞儚瀛樺偍姹犲悕绉�*/
+    String recordBucketName;
+    /*褰曞儚鏂囦欢鍚嶇О*/
+    String recordObjectName;
 }

--
Gitblit v1.9.3