From ba1e219d97e123b91657dc424f13a2fdeaa85d21 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: Mon, 21 Aug 2023 13:37:01 +0800
Subject: [PATCH] 修改兴趣点列表井号模糊查询
---
ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 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 897cf88..cfdf554 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,7 @@
package com.ruoyi.device.camera.domain;
+import com.ruoyi.device.channel.domain.ArdChannel;
+import com.sun.jna.Structure;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -7,6 +9,7 @@
import com.ruoyi.common.core.domain.BaseEntity;
import java.util.Date;
+import java.util.List;
/**
* 相机设备对象 ard_cameras
@@ -19,7 +22,10 @@
@NoArgsConstructor
public class ArdCameras extends BaseEntity {
private static final long serialVersionUID = 1L;
-
+ public ArdCameras(String gdtype)
+ {
+ this.gdtype=gdtype;
+ }
/**
* id
*/
@@ -68,11 +74,7 @@
@Excel(name = "光电类型")
private String gdtype;
- /**
- * 通道号
- */
- @Excel(name = "通道号")
- private Integer channel;
+
/**
* 经度
@@ -151,14 +153,41 @@
*/
@Excel(name = "视场角")
private Double camFov;
+
+ /**
+ * 最大可视距离
+ */
+ @Excel(name = "最大可视距离")
+ private Double camMaxVisibleDistance;
+ /** 相机报警引导开关 */
+ @Excel(name = "相机报警引导开关")
+ private Integer camAlarmGuideEnable;
/**
* 所属塔ID
*/
private String towerId;
+
/**
* 登录ID
*/
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