From 7a7048db22ace25df5fd39a78c32ea6685c97862 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期二, 02 七月 2024 10:49:38 +0800
Subject: [PATCH] 电磁锁概要操作修改提交

---
 ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java |   38 +++++++++++++++++++++++++++++++-------
 1 files changed, 31 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 c96576a..59b8e3a 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,17 +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;
     /*浜戝彴閫熷害*/
@@ -23,11 +35,23 @@
     /*鑱氱劍鍊�*/
     Integer dwFocusPos;
     /*PTZ鍊�*/
-    Map<String,Double>ptzMap;
-    /*杩囨湡闂撮殧锛堝垎閽燂級*/
-    Integer expired;
-    /*鐩告満缁忕含搴�*/
-    String camPosition;
+    Map<String, Double> ptzMap;
+
     /*鐩爣缁忕含搴�*/
-    String targetPosition;
+    double[]  targetPosition;
+    /*鐩爣浜�*/
+    String wellId;
+
+    /*褰撳墠鎿嶄綔鑰�*/
+    String operator;
+    /*杩囨湡闂撮殧锛堢锛�*/
+    Integer expired;
+    /*褰撳墠鎿嶄綔鑰呭悕瀛�*/
+    String operatorZh;
+    /*褰曞儚瀛樺偍姹犲悕绉�*/
+    String recordBucketName;
+    /*褰曞儚鏂囦欢鍚嶇О*/
+    String recordObjectName;
+
+    Long recordId;
 }

--
Gitblit v1.9.3