From 6bab172dc8767e93c8889c15a146c76e4d38e9c0 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 27 七月 2024 09:23:04 +0800
Subject: [PATCH] 电磁锁报警查询bug修改提交
---
ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 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 472f2b5..50321c3 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
@@ -64,19 +68,21 @@
* 瀵嗙爜
*/
@Excel(name = "瀵嗙爜")
+ @Sensitive(strategy = SensitiveStrategy.PASSWORD)
private String password;
/**
* 鍏夌數绫诲瀷
+ * 0-灏忓厜鐢� 1-澶у厜鐢� 2-缁堢NVR 3-瓒呰剳
*/
@Excel(name = "鍏夌數绫诲瀷")
private String gdtype;
/**
- * 閫氶亾鍙�
+ * 鍘傚晢
*/
- @Excel(name = "閫氶亾鍙�")
- private Integer channel;
+ @Excel(name = "鍘傚晢")
+ private String factory;
/**
* 缁忓害
@@ -106,7 +112,7 @@
* 閮ㄩ棬ID
*/
@Excel(name = "閮ㄩ棬ID")
- private Integer deptId;
+ private Long deptId;
/**
* 鏂逛綅瑙�
@@ -172,7 +178,41 @@
/**
* 鐧诲綍ID
*/
- private Integer loginId;
+ private Long loginId;
+ /**
+ * 鍦ㄧ嚎鐘舵�� 0-绂荤嚎 1-鍦ㄧ嚎
+ */
+ private String state;
private String operatorId;
private Date operatorExpired;
+ /**
+ * 閫氶亾鍙�
+ */
+ private Integer chanNo;
+ /**
+ * 璧峰閫氶亾鍙�
+ */
+ private Integer startChan;
+ /**
+ * 閫氶亾鏁�
+ */
+ @Excel(name = "閫氶亾鏁�")
+ private Integer chanNum;
+ /**
+ * 閫氶亾
+ */
+ private List<ArdChannel> channelList;
+
+ @Override
+ public int hashCode() {
+ return id.hashCode();
+ }
+ @Override
+ public boolean equals(Object obj) {
+ if (obj instanceof ArdCameras){
+ return id.equals(((ArdCameras)obj).getId());
+ }else {
+ return false;
+ }
+ }
}
--
Gitblit v1.9.3