From 811b14aa5cd2bd6d4313b43dc38ce87cd938f3b0 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期二, 23 七月 2024 17:12:42 +0800
Subject: [PATCH] 优化:通道同步任务 增加：根据用户统计未读总数
---
ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 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 cfdf554..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,7 @@
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;
@@ -66,15 +68,21 @@
* 瀵嗙爜
*/
@Excel(name = "瀵嗙爜")
+ @Sensitive(strategy = SensitiveStrategy.PASSWORD)
private String password;
/**
* 鍏夌數绫诲瀷
+ * 0-灏忓厜鐢� 1-澶у厜鐢� 2-缁堢NVR 3-瓒呰剳
*/
@Excel(name = "鍏夌數绫诲瀷")
private String gdtype;
-
+ /**
+ * 鍘傚晢
+ */
+ @Excel(name = "鍘傚晢")
+ private String factory;
/**
* 缁忓害
@@ -104,7 +112,7 @@
* 閮ㄩ棬ID
*/
@Excel(name = "閮ㄩ棬ID")
- private Integer deptId;
+ private Long deptId;
/**
* 鏂逛綅瑙�
@@ -170,7 +178,11 @@
/**
* 鐧诲綍ID
*/
- private Integer loginId;
+ private Long loginId;
+ /**
+ * 鍦ㄧ嚎鐘舵�� 0-绂荤嚎 1-鍦ㄧ嚎
+ */
+ private String state;
private String operatorId;
private Date operatorExpired;
/**
@@ -180,7 +192,7 @@
/**
* 璧峰閫氶亾鍙�
*/
- private Integer startDChan;
+ private Integer startChan;
/**
* 閫氶亾鏁�
*/
@@ -190,4 +202,17 @@
* 閫氶亾
*/
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