From ffb0fcb9072a043c333837fa83bd976b03fea091 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 02 十二月 2021 09:30:57 +0800
Subject: [PATCH] Merge pull request #259 from hotcoffie/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 212 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 181 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 8a88497..761437f 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,21 +35,85 @@
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 String registerTime;
+
+
+ /**
+ * 蹇冭烦鏃堕棿
+ */
+ private String keepaliveTime;
+
+ /**
+ * 閫氶亾涓暟
+ */
private int channelCount;
+
+ /**
+ * 娉ㄥ唽鏈夋晥鏈�
+ */
+ private int expires;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private String createTime;
+
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ private String updateTime;
+
+ /**
+ * 璁惧浣跨敤鐨勫獟浣搃d, 榛樿涓簄ull
+ */
+ private String mediaServerId;
+
+ /**
+ * 棣栨娉ㄥ唽
+ */
+ private boolean firsRegister;
+
+ /**
+ * 瀛楃闆�, 鏀寔 utf-8 涓� gb2312
+ */
+ private String charset ;
+
+ /**
+ * 鐩綍璁㈤槄鍛ㄦ湡锛�0涓轰笉璁㈤槄
+ */
+ private int subscribeCycleForCatalog ;
+
public String getDeviceId() {
@@ -69,30 +131,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() {
return manufacturer;
@@ -118,6 +156,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;
}
@@ -133,4 +211,76 @@
public void setChannelCount(int channelCount) {
this.channelCount = channelCount;
}
+
+ public String getRegisterTime() {
+ return registerTime;
+ }
+
+ public void setRegisterTime(String registerTime) {
+ this.registerTime = registerTime;
+ }
+
+ public String getKeepaliveTime() {
+ return keepaliveTime;
+ }
+
+ public void setKeepaliveTime(String keepaliveTime) {
+ this.keepaliveTime = keepaliveTime;
+ }
+
+ public int getExpires() {
+ return expires;
+ }
+
+ public void setExpires(int expires) {
+ this.expires = expires;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(String updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getMediaServerId() {
+ return mediaServerId;
+ }
+
+ public void setMediaServerId(String mediaServerId) {
+ this.mediaServerId = mediaServerId;
+ }
+
+ public boolean isFirsRegister() {
+ return firsRegister;
+ }
+
+ public void setFirsRegister(boolean firsRegister) {
+ this.firsRegister = firsRegister;
+ }
+
+ public String getCharset() {
+ return charset;
+ }
+
+ public void setCharset(String charset) {
+ this.charset = charset;
+ }
+
+ public int getSubscribeCycleForCatalog() {
+ return subscribeCycleForCatalog;
+ }
+
+ public void setSubscribeCycleForCatalog(int subscribeCycleForCatalog) {
+ this.subscribeCycleForCatalog = subscribeCycleForCatalog;
+ }
}
--
Gitblit v1.8.0