From 255a6915a9898fe6c1a6649cae707649226ec177 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 08 九月 2023 16:30:34 +0800
Subject: [PATCH] 程序启动清空相机缓存列表重新加载 增加sdk获取相机聚焦值接口 修改相机登录时离线清空通道列表 增加获取码流压缩参数(分辨率/编码格式/码率/流类型) 优化相机在线离线业务方法,修改仅在线设备上传ptz

---
 ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 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 7f8f0ec..ad30ca7 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,19 @@
 
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
+import org.springframework.boot.context.properties.bind.DefaultValue;
 
 import java.util.Map;
 
 @Data
 @ApiModel(description = "sdk鍛戒护瀹炰綋绫�")
 public class CameraCmd {
-
+    /*鍛戒护鏍囪瘑*/
+    String cmdType;
     /*鐩告満ID*/
     String cameraId;
     /*鐩告満閫氶亾鍙�*/
-    Integer channelNum;
+    Integer chanNo;
     /*浜戝彴浠g爜*/
     Integer code;
     /*浜戝彴閫熷害*/
@@ -26,8 +28,6 @@
     /*PTZ鍊�*/
     Map<String,Double>ptzMap;
 
-    /*鐩告満缁忕含搴�*/
-//    double[] camPosition;
     /*鐩爣缁忕含搴�*/
     double[] targetPosition;
 
@@ -35,11 +35,10 @@
     String operator;
     /*杩囨湡闂撮殧锛堢锛�*/
     Integer expired;
-
+    /*褰撳墠鎿嶄綔鑰呭悕瀛�*/
+    String operatorZh;
     /*褰曞儚瀛樺偍姹犲悕绉�*/
     String recordBucketName;
     /*褰曞儚鏂囦欢鍚嶇О*/
     String recordObjectName;
-    /*鏄惁涓婁紶minio*/
-    boolean isUploadMinio;
 }

--
Gitblit v1.9.3