From 133098a6f81de1de99cb0a5c829b7d1b39105e84 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 29 二月 2024 17:03:11 +0800
Subject: [PATCH] 获取附近相机增加数据权限

---
 ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java |   42 +++++++++++++++++++++++++++++++++++-------
 1 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java b/ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java
index c2d323a..358aca0 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java
@@ -1,5 +1,6 @@
 package com.ruoyi.device.camera.domain;
 
+import com.ruoyi.device.channel.domain.ArdChannel;
 import com.sun.jna.Structure;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -8,6 +9,7 @@
 import com.ruoyi.common.core.domain.BaseEntity;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 鐩告満璁惧瀵硅薄 ard_cameras
@@ -20,7 +22,10 @@
 @NoArgsConstructor
 public class ArdCameras extends BaseEntity {
     private static final long serialVersionUID = 1L;
-
+    public ArdCameras(String gdtype)
+    {
+        this.gdtype=gdtype;
+    }
     /**
      * id
      */
@@ -70,10 +75,10 @@
     private String gdtype;
 
     /**
-     * 閫氶亾鍙�
+     * 鍘傚晢
      */
-    @Excel(name = "閫氶亾鍙�")
-    private Integer channel;
+    @Excel(name = "鍘傚晢")
+    private String factory;
 
     /**
      * 缁忓害
@@ -103,7 +108,7 @@
      * 閮ㄩ棬ID
      */
     @Excel(name = "閮ㄩ棬ID")
-    private Integer deptId;
+    private Long deptId;
 
     /**
      * 鏂逛綅瑙�
@@ -157,8 +162,10 @@
      * 鏈�澶у彲瑙嗚窛绂�
      */
     @Excel(name = "鏈�澶у彲瑙嗚窛绂�")
-    private String camMaxVisibleDistance;
-
+    private Double camMaxVisibleDistance;
+    /** 鐩告満鎶ヨ寮曞寮�鍏� */
+    @Excel(name = "鐩告満鎶ヨ寮曞寮�鍏�")
+    private Integer camAlarmGuideEnable;
     /**
      * 鎵�灞炲ID
      */
@@ -168,6 +175,27 @@
      * 鐧诲綍ID
      */
     private Integer loginId;
+    /**
+     * 鍦ㄧ嚎鐘舵�� 0-绂荤嚎 1-鍦ㄧ嚎
+     */
+    private String state;
     private String operatorId;
     private Date operatorExpired;
+    /**
+     * 閫氶亾鍙�
+     */
+    private Integer chanNo;
+    /**
+     * 璧峰閫氶亾鍙�
+     */
+    private Integer startDChan;
+    /**
+     * 閫氶亾鏁�
+     */
+    @Excel(name = "閫氶亾鏁�")
+    private Integer chanNum;
+    /**
+     * 閫氶亾
+     */
+    private List<ArdChannel> channelList;
 }

--
Gitblit v1.9.3