From a70d0dfe221e06381b6e290d1dab85c9ab4fdc31 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 23 三月 2024 08:36:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 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..0469bff 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
@@ -1,18 +1,29 @@
package com.ruoyi.device.camera.domain;
+import com.ruoyi.alarm.global.domain.GuidePoint;
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;
/*浜戝彴浠ｇ爜*/
Integer code;
/*浜戝彴閫熷害*/
@@ -24,14 +35,21 @@
/*鑱氱劍鍊�*/
Integer dwFocusPos;
/*PTZ鍊�*/
- Map<String,Double>ptzMap;
+ Map<String, Double> ptzMap;
- /*鐩告満缁忕含搴�*/
- String camPosition;
/*鐩爣缁忕含搴�*/
- String targetPosition;
+ double[] targetPosition;
+ /*鐩爣浜�*/
+ String wellId;
+
/*褰撳墠鎿嶄綔鑰�*/
String operator;
- /*杩囨湡闂撮殧锛堝垎閽燂級*/
+ /*杩囨湡闂撮殧锛堢锛�*/
Integer expired;
+ /*褰撳墠鎿嶄綔鑰呭悕瀛�*/
+ String operatorZh;
+ /*褰曞儚瀛樺偍姹犲悕绉�*/
+ String recordBucketName;
+ /*褰曞儚鏂囦欢鍚嶇О*/
+ String recordObjectName;
}
--
Gitblit v1.9.3