From 53e14c1919c4a3112f963689d0ce75fa08831021 Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期六, 19 八月 2023 12:32:20 +0800 Subject: [PATCH] 增加通道管理业务 修改相机部分实体字段 --- ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java | 34 +++++++++++++++++++++++++++------- 1 files changed, 27 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 379d083..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,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 */ @@ -69,11 +74,7 @@ @Excel(name = "鍏夌數绫诲瀷") private String gdtype; - /** - * 閫氶亾鍙� - */ - @Excel(name = "閫氶亾鍙�") - private Integer channel; + /** * 缁忓害 @@ -158,7 +159,9 @@ */ @Excel(name = "鏈�澶у彲瑙嗚窛绂�") private Double camMaxVisibleDistance; - + /** 鐩告満鎶ヨ寮曞寮�鍏� */ + @Excel(name = "鐩告満鎶ヨ寮曞寮�鍏�") + private Integer camAlarmGuideEnable; /** * 鎵�灞炲ID */ @@ -170,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