From 2f108a46d05e34981d52b447d73f0cfd8e8c30fd Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 17 十一月 2021 16:24:31 +0800
Subject: [PATCH] Merge pull request #232 from chenparty/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java | 143 ++++++++++++++++++++++++++++++-----------------
1 files changed, 92 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
index 00bd995..6d40e36 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
@@ -2,10 +2,17 @@
public class DeviceChannel {
+
+
/**
* 閫氶亾id
*/
private String channelId;
+
+ /**
+ * 璁惧id
+ */
+ private String deviceId;
/**
* 閫氶亾鍚�
@@ -111,6 +118,16 @@
* 浜戝彴绫诲瀷鎻忚堪瀛楃涓�
*/
private String PTZTypeText;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private String createTime;
+
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ private String updateTime;
/**
* 鍦ㄧ嚎/绂荤嚎
@@ -141,12 +158,41 @@
/**
* 娴佸敮涓�缂栧彿锛屽瓨鍦ㄨ〃绀烘鍦ㄧ洿鎾�
*/
- private String ssrc;
+ private String streamId;
/**
* 鏄惁鍚湁闊抽
*/
- private boolean hasAudio;
+ private boolean hasAudio;
+
+ public String getDeviceId() {
+ return deviceId;
+ }
+
+ public void setDeviceId(String deviceId) {
+ this.deviceId = deviceId;
+ }
+
+ public void setPTZType(int PTZType) {
+ this.PTZType = PTZType;
+ switch (PTZType) {
+ case 0:
+ this.PTZTypeText = "鏈煡";
+ break;
+ case 1:
+ this.PTZTypeText = "鐞冩満";
+ break;
+ case 2:
+ this.PTZTypeText = "鍗婄悆";
+ break;
+ case 3:
+ this.PTZTypeText = "鍥哄畾鏋満";
+ break;
+ case 4:
+ this.PTZTypeText = "閬ユ帶鏋満";
+ break;
+ }
+ }
public String getChannelId() {
return channelId;
@@ -162,14 +208,6 @@
public void setName(String name) {
this.name = name;
- }
-
- public int getStatus() {
- return status;
- }
-
- public void setStatus(int status) {
- this.status = status;
}
public String getManufacture() {
@@ -316,6 +354,26 @@
this.password = password;
}
+ public int getPTZType() {
+ return PTZType;
+ }
+
+ public String getPTZTypeText() {
+ return PTZTypeText;
+ }
+
+ public void setPTZTypeText(String PTZTypeText) {
+ this.PTZTypeText = PTZTypeText;
+ }
+
+ public int getStatus() {
+ return status;
+ }
+
+ public void setStatus(int status) {
+ this.status = status;
+ }
+
public double getLongitude() {
return longitude;
}
@@ -332,43 +390,6 @@
this.latitude = latitude;
}
- public int getPTZType() {
- return PTZType;
- }
-
- public void setPTZType(int PTZType) {
- this.PTZType = PTZType;
- switch (PTZType) {
- case 0:
- this.PTZTypeText = "鏈煡";
- break;
- case 1:
- this.PTZTypeText = "鐞冩満";
- break;
- case 2:
- this.PTZTypeText = "鍗婄悆";
- break;
- case 3:
- this.PTZTypeText = "鍥哄畾鏋満";
- break;
- case 4:
- this.PTZTypeText = "閬ユ帶鏋満";
- break;
- }
- }
-
- public String getPTZTypeText() {
- return PTZTypeText;
- }
-
- public String getSsrc() {
- return ssrc;
- }
-
- public void setSsrc(String ssrc) {
- this.ssrc = ssrc;
- }
-
public int getSubCount() {
return subCount;
}
@@ -377,10 +398,6 @@
this.subCount = subCount;
}
- public void setPTZTypeText(String PTZTypeText) {
- this.PTZTypeText = PTZTypeText;
- }
-
public boolean isHasAudio() {
return hasAudio;
}
@@ -388,4 +405,28 @@
public void setHasAudio(boolean hasAudio) {
this.hasAudio = hasAudio;
}
+
+ public String getStreamId() {
+ return streamId;
+ }
+
+ public void setStreamId(String streamId) {
+ this.streamId = streamId;
+ }
+
+ 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;
+ }
}
--
Gitblit v1.8.0