From 35c0394c5bbff4dc8ae58a8dbaea40019fc284f2 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期一, 19 十月 2020 20:29:21 +0800
Subject: [PATCH] 格式化
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java | 80 +++++++++++++++++++++++++++-------------
1 files changed, 54 insertions(+), 26 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..de52ac6 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,8 @@
package com.genersoft.iot.vmp.gb28181.bean;
-import java.util.Map;
+import java.util.List;
+import java.util.Map;
public class Device {
@@ -37,6 +38,14 @@
private String transport;
/**
+ * 鏁版嵁娴佷紶杈撴ā寮�
+ * UDP:udp浼犺緭
+ * TCP-ACTIVE锛歵cp涓诲姩妯″紡
+ * TCP-PASSIVE锛歵cp琚姩妯″紡
+ */
+ private String streamMode;
+
+ /**
* wan鍦板潃
*/
private Host host;
@@ -49,8 +58,11 @@
/**
* 閫氶亾鍒楄〃
*/
- private Map<String,DeviceChannel> channelMap;
+// private Map<String,DeviceChannel> channelMap;
+ private int channelCount;
+
+ private List<String> channelList;
public String getDeviceId() {
return deviceId;
@@ -66,30 +78,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 +104,30 @@
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 Host getHost() {
+ return host;
+ }
+
+ public void setHost(Host host) {
+ this.host = host;
+ }
+
public int getOnline() {
return online;
}
@@ -123,4 +135,20 @@
public void setOnline(int online) {
this.online = online;
}
+
+ public int getChannelCount() {
+ return channelCount;
+ }
+
+ public void setChannelCount(int channelCount) {
+ this.channelCount = channelCount;
+ }
+
+ public List<String> getChannelList() {
+ return channelList;
+ }
+
+ public void setChannelList(List<String> channelList) {
+ this.channelList = channelList;
+ }
}
--
Gitblit v1.8.0