From 641d7d8e42ac45a339b885191822646cec842fc7 Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期一, 07 六月 2021 11:32:07 +0800
Subject: [PATCH] 修复无参数zlm请求代理失败的问题 添加对无密码直接注册功能的支持
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 67 ++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
index 12b8a00..f587e75 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
@@ -1,16 +1,7 @@
package com.genersoft.iot.vmp.gb28181.bean;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
public class Device {
-
- /**
- * 鏁版嵁搴撳瓨鍌↖D
- */
- private int id;
/**
* 璁惧Id
@@ -52,9 +43,19 @@
private String streamMode;
/**
+ * wan鍦板潃_ip
+ */
+ private String ip;
+
+ /**
+ * wan鍦板潃_port
+ */
+ private int port;
+
+ /**
* wan鍦板潃
*/
- private Host host;
+ private String hostAddress;
/**
* 鍦ㄧ嚎
@@ -67,18 +68,16 @@
*/
private Long registerTimeMillis;
+
+ /**
+ * 蹇冭烦鏃堕棿
+ */
+ private Long KeepaliveTimeMillis;
+
/**
* 閫氶亾涓暟
*/
private int channelCount;
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
public String getDeviceId() {
return deviceId;
@@ -136,12 +135,28 @@
this.streamMode = streamMode;
}
- public Host getHost() {
- return host;
+ public String getIp() {
+ return ip;
}
- public void setHost(Host host) {
- this.host = host;
+ public void setIp(String ip) {
+ this.ip = ip;
+ }
+
+ public int getPort() {
+ return port;
+ }
+
+ public void setPort(int port) {
+ this.port = port;
+ }
+
+ public String getHostAddress() {
+ return hostAddress;
+ }
+
+ public void setHostAddress(String hostAddress) {
+ this.hostAddress = hostAddress;
}
public int getOnline() {
@@ -167,4 +182,12 @@
public void setRegisterTimeMillis(Long registerTimeMillis) {
this.registerTimeMillis = registerTimeMillis;
}
+
+ public Long getKeepaliveTimeMillis() {
+ return KeepaliveTimeMillis;
+ }
+
+ public void setKeepaliveTimeMillis(Long keepaliveTimeMillis) {
+ KeepaliveTimeMillis = keepaliveTimeMillis;
+ }
}
--
Gitblit v1.8.0