From 7dfd5f52332212d2f2c111cc11147469a68b7bdb Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 11 三月 2024 17:23:34 +0800
Subject: [PATCH] 取消坐标数组改为实体类

---
 ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 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 227c222..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;
     /*浜戝彴浠g爜*/
     Integer code;
     /*浜戝彴閫熷害*/
@@ -24,22 +35,21 @@
     /*鑱氱劍鍊�*/
     Integer dwFocusPos;
     /*PTZ鍊�*/
-    Map<String,Double>ptzMap;
+    Map<String, Double> ptzMap;
 
-    /*鐩告満缁忕含搴�*/
-//    double[] camPosition;
     /*鐩爣缁忕含搴�*/
-    double[] targetPosition;
+    double[]  targetPosition;
+    /*鐩爣浜�*/
+    String wellId;
 
     /*褰撳墠鎿嶄綔鑰�*/
     String operator;
-    /*杩囨湡闂撮殧锛堝垎閽燂級*/
+    /*杩囨湡闂撮殧锛堢锛�*/
     Integer expired;
-
+    /*褰撳墠鎿嶄綔鑰呭悕瀛�*/
+    String operatorZh;
     /*褰曞儚瀛樺偍姹犲悕绉�*/
     String recordBucketName;
     /*褰曞儚鏂囦欢鍚嶇О*/
     String recordObjectName;
-    /*鏄惁涓婁紶minio*/
-    boolean isUploadMinio;
 }

--
Gitblit v1.9.3