From a209ba77ead73c273c75d0638a3bae2ea8626765 Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期五, 04 六月 2021 17:30:23 +0800
Subject: [PATCH] 修复bug
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 129 ++++++++++++++++++++++++++++++++----------
1 files changed, 98 insertions(+), 31 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 74f86a2..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,7 +1,5 @@
package com.genersoft.iot.vmp.gb28181.bean;
-import java.util.Map;
-
public class Device {
@@ -37,20 +35,49 @@
private String transport;
/**
+ * 鏁版嵁娴佷紶杈撴ā寮�
+ * UDP:udp浼犺緭
+ * TCP-ACTIVE锛歵cp涓诲姩妯″紡
+ * TCP-PASSIVE锛歵cp琚姩妯″紡
+ */
+ private String streamMode;
+
+ /**
+ * wan鍦板潃_ip
+ */
+ private String ip;
+
+ /**
+ * wan鍦板潃_port
+ */
+ private int port;
+
+ /**
* wan鍦板潃
*/
- private Host host;
+ private String hostAddress;
/**
* 鍦ㄧ嚎
*/
private int online;
- /**
- * 閫氶亾鍒楄〃
- */
- private Map<String,DeviceChannel> channelMap;
+ /**
+ * 娉ㄥ唽鏃堕棿
+ */
+ private Long registerTimeMillis;
+
+
+ /**
+ * 蹇冭烦鏃堕棿
+ */
+ private Long KeepaliveTimeMillis;
+
+ /**
+ * 閫氶亾涓暟
+ */
+ private int channelCount;
public String getDeviceId() {
return deviceId;
@@ -66,30 +93,6 @@
public void setName(String name) {
this.name = name;
- }
-
- public String getTransport() {
- return transport;
- }
-
- public void setTransport(String transport) {
- this.transport = transport;
- }
-
- public Host getHost() {
- return host;
- }
-
- public void setHost(Host host) {
- this.host = host;
- }
-
- public Map<String, DeviceChannel> getChannelMap() {
- return channelMap;
- }
-
- public void setChannelMap(Map<String, DeviceChannel> channelMap) {
- this.channelMap = channelMap;
}
public String getManufacturer() {
@@ -116,6 +119,46 @@
this.firmware = firmware;
}
+ public String getTransport() {
+ return transport;
+ }
+
+ public void setTransport(String transport) {
+ this.transport = transport;
+ }
+
+ public String getStreamMode() {
+ return streamMode;
+ }
+
+ public void setStreamMode(String streamMode) {
+ this.streamMode = streamMode;
+ }
+
+ public String getIp() {
+ return ip;
+ }
+
+ 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() {
return online;
}
@@ -123,4 +166,28 @@
public void setOnline(int online) {
this.online = online;
}
+
+ public int getChannelCount() {
+ return channelCount;
+ }
+
+ public void setChannelCount(int channelCount) {
+ this.channelCount = channelCount;
+ }
+
+ public Long getRegisterTimeMillis() {
+ return registerTimeMillis;
+ }
+
+ public void setRegisterTimeMillis(Long registerTimeMillis) {
+ this.registerTimeMillis = registerTimeMillis;
+ }
+
+ public Long getKeepaliveTimeMillis() {
+ return KeepaliveTimeMillis;
+ }
+
+ public void setKeepaliveTimeMillis(Long keepaliveTimeMillis) {
+ KeepaliveTimeMillis = keepaliveTimeMillis;
+ }
}
--
Gitblit v1.8.0