Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

# Conflicts:
#	README.md
#	src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHTTPProxyController.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
#	src/main/java/com/genersoft/iot/vmp/storager/jdbc/VideoManagerJdbcStoragerImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/playback/PlaybackController.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
#	src/main/resources/application-dev.yml
#	web_src/src/components/gb28181/devicePlayer.vue

src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java

@@ -1,9 +1,6 @@
 package com.genersoft.iot.vmp.gb28181.bean;
 
 
-import java.util.List;
-import java.util.Map;
-
 public class Device {
 
 	/**
@@ -45,25 +42,37 @@ public class Device {
 	 */
 	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;
 
-	private List<String> channelList;
-
 	public String getDeviceId() {
 		return deviceId;
 	}
@@ -120,12 +129,28 @@ public class Device {
 		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() {
@@ -144,11 +169,11 @@ public class Device {
 		this.channelCount = channelCount;
 	}
 
-	public List<String> getChannelList() {
-		return channelList;
+	public Long getRegisterTimeMillis() {
+		return registerTimeMillis;
 	}
 
-	public void setChannelList(List<String> channelList) {
-		this.channelList = channelList;
+	public void setRegisterTimeMillis(Long registerTimeMillis) {
+		this.registerTimeMillis = registerTimeMillis;
 	}
 }

src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java

@@ -2,10 +2,17 @@ package com.genersoft.iot.vmp.gb28181.bean;
 
 public class DeviceChannel {
 
+
+
 	/**
 	 * 通道id
 	 */
 	private String channelId;
+
+	/**
+	 * 设备id
+	 */
+	private String deviceId;
 	
 	/**
 	 * 通道名
@@ -141,18 +148,20 @@ public class DeviceChannel {
 	/**
 	 * 流唯一编号，存在表示正在直播
 	 */
-	private String  ssrc;
+	private String  streamId;
 
 	/**
 	 *  是否含有音频
 	 */
-	private  boolean hasAudio;
+	private boolean hasAudio;
 
-	/**
-	 *  是否正在播放
-	 */
-	private  boolean play;
+	public String getDeviceId() {
+		return deviceId;
+	}
 
+	public void setDeviceId(String deviceId) {
+		this.deviceId = deviceId;
+	}
 
 	public void setPTZType(int PTZType) {
 		this.PTZType = PTZType;
@@ -379,14 +388,6 @@ public class DeviceChannel {
 		this.subCount = subCount;
 	}
 
-	public String getSsrc() {
-		return ssrc;
-	}
-
-	public void setSsrc(String ssrc) {
-		this.ssrc = ssrc;
-	}
-
 	public boolean isHasAudio() {
 		return hasAudio;
 	}
@@ -395,11 +396,11 @@ public class DeviceChannel {
 		this.hasAudio = hasAudio;
 	}
 
-	public boolean isPlay() {
-		return play;
+	public String getStreamId() {
+		return streamId;
 	}
 
-	public void setPlay(boolean play) {
-		this.play = play;
+	public void setStreamId(String streamId) {
+		this.streamId = streamId;
 	}
 }