From 74c08a504d55ae137004cb44e0145010f62f9585 Mon Sep 17 00:00:00 2001 From: Administrator <1144154118@qq.com> Date: 星期五, 25 八月 2023 14:47:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 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 c96576a..4ec8ce2 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 @@ -8,6 +8,8 @@ @Data @ApiModel(description = "sdk鍛戒护瀹炰綋绫�") public class CameraCmd { + /*鍛戒护鏍囪瘑*/ + String cmdType; /*鐩告満ID*/ String cameraId; /*鐩告満閫氶亾鍙�*/ @@ -24,10 +26,18 @@ Integer dwFocusPos; /*PTZ鍊�*/ Map<String,Double>ptzMap; - /*杩囨湡闂撮殧锛堝垎閽燂級*/ - Integer expired; - /*鐩告満缁忕含搴�*/ - String camPosition; + /*鐩爣缁忕含搴�*/ - String targetPosition; + double[] targetPosition; + + /*褰撳墠鎿嶄綔鑰�*/ + String operator; + /*杩囨湡闂撮殧锛堢锛�*/ + Integer expired; + /*褰撳墠鎿嶄綔鑰呭悕瀛�*/ + String operatorZh; + /*褰曞儚瀛樺偍姹犲悕绉�*/ + String recordBucketName; + /*褰曞儚鏂囦欢鍚嶇О*/ + String recordObjectName; } -- Gitblit v1.9.3