From 4a10315e35dd547300990e9f806d19d33c261d74 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 21 八月 2023 17:14:29 +0800
Subject: [PATCH] 一键调度按登录用户得部门查询人和相机

---
 ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 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 472f2b5..1c8ed55 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
@@ -72,11 +74,7 @@
     @Excel(name = "鍏夌數绫诲瀷")
     private String gdtype;
 
-    /**
-     * 閫氶亾鍙�
-     */
-    @Excel(name = "閫氶亾鍙�")
-    private Integer channel;
+
 
     /**
      * 缁忓害
@@ -106,7 +104,7 @@
      * 閮ㄩ棬ID
      */
     @Excel(name = "閮ㄩ棬ID")
-    private Integer deptId;
+    private Long deptId;
 
     /**
      * 鏂逛綅瑙�
@@ -175,4 +173,21 @@
     private Integer loginId;
     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