From e069e7d92ff67f4ddc29ae5129b736502d0f03cb Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期四, 18 四月 2024 11:27:50 +0800 Subject: [PATCH] 雷达在线注释掉 --- ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 44 insertions(+), 5 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 1102b9f..a8cf456 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,8 @@ package com.ruoyi.device.camera.domain; +import com.lzhpo.sensitive.SensitiveStrategy; +import com.lzhpo.sensitive.annocation.Sensitive; +import com.ruoyi.device.channel.domain.ArdChannel; import com.sun.jna.Structure; import lombok.AllArgsConstructor; import lombok.Data; @@ -8,6 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity; import java.util.Date; +import java.util.List; /** * 鐩告満璁惧瀵硅薄 ard_cameras @@ -20,7 +24,10 @@ @NoArgsConstructor public class ArdCameras extends BaseEntity { private static final long serialVersionUID = 1L; - + public ArdCameras(String gdtype) + { + this.gdtype=gdtype; + } /** * id */ @@ -61,6 +68,7 @@ * 瀵嗙爜 */ @Excel(name = "瀵嗙爜") + @Sensitive(strategy = SensitiveStrategy.PASSWORD) private String password; /** @@ -70,10 +78,10 @@ private String gdtype; /** - * 閫氶亾鍙� + * 鍘傚晢 */ - @Excel(name = "閫氶亾鍙�") - private Integer channel; + @Excel(name = "鍘傚晢") + private String factory; /** * 缁忓害 @@ -103,7 +111,7 @@ * 閮ㄩ棬ID */ @Excel(name = "閮ㄩ棬ID") - private Integer deptId; + private Long deptId; /** * 鏂逛綅瑙� @@ -152,14 +160,45 @@ */ @Excel(name = "瑙嗗満瑙�") private Double camFov; + + /** + * 鏈�澶у彲瑙嗚窛绂� + */ + @Excel(name = "鏈�澶у彲瑙嗚窛绂�") + private Double camMaxVisibleDistance; + /** 鐩告満鎶ヨ寮曞寮�鍏� */ + @Excel(name = "鐩告満鎶ヨ寮曞寮�鍏�") + private Integer camAlarmGuideEnable; /** * 鎵�灞炲ID */ private String towerId; + /** * 鐧诲綍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