From 56859d09df8d4226882d43934acf32d60a3b51d7 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期二, 30 三月 2021 18:46:34 +0800
Subject: [PATCH] 添加推流列表和拉流代理,下一步与国标关联

---
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java |  115 ++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 84 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..9393106 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,43 @@
 	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 int channelCount;
 
 	public String getDeviceId() {
 		return deviceId;
@@ -66,30 +87,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 +113,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 +160,20 @@
 	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;
+	}
 }

--
Gitblit v1.8.0