From 49207386ea4a3d663628347eef443af9c7cc7f39 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 17 十月 2023 17:20:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 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 aa69473..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;
/*浜戝彴浠ｇ爜*/
Integer code;
/*浜戝彴閫熷害*/
@@ -26,20 +28,17 @@
/*PTZ鍊�*/
Map<String,Double>ptzMap;
- /*鐩告満缁忕含搴�*/
- double[] camPosition;
/*鐩爣缁忕含搴�*/
double[] targetPosition;
/*褰撳墠鎿嶄綔鑰�*/
String operator;
- /*杩囨湡闂撮殧锛堝垎閽燂級*/
+ /*杩囨湡闂撮殧锛堢锛�*/
Integer expired;
-
+ /*褰撳墠鎿嶄綔鑰呭悕瀛�*/
+ String operatorZh;
/*褰曞儚瀛樺偍姹犲悕绉�*/
String recordBucketName;
/*褰曞儚鏂囦欢鍚嶇О*/
String recordObjectName;
- /*鏄惁涓婁紶minio*/
- boolean isUploadMinio;
}
--
Gitblit v1.9.3