From 335916f1f15eb9d0b34dea38cacee2300eac0606 Mon Sep 17 00:00:00 2001
From: 李防 <liguofang0703@126.com>
Date: 星期一, 07 三月 2022 14:20:27 +0800
Subject: [PATCH] InviteRequestProcessor类中，channelid从invite消息的header subject获取，不再从第一行request line获取。原因是和第三方平台对接时，发送的invite消息第一行为国标平台编码而不是设备通道编码，导致报错通道不存在，返回404。
---
src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
index 0aec885..0c06145 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/ParentPlatform.java
@@ -3,6 +3,11 @@
public class ParentPlatform {
/**
+ * id
+ */
+ private Integer id;
+
+ /**
* 鏄惁鍚敤
*/
private boolean enable;
@@ -81,7 +86,7 @@
/**
* 鍏佽浜戝彴鎺у埗
*/
- private boolean PTZEnable;
+ private boolean ptz;
/**
* RTCP娴佷繚娲�
@@ -99,6 +104,23 @@
*/
private int channelCount;
+ /**
+ * 鍏变韩鎵�鏈夌殑鐩存挱娴�
+ */
+ private boolean shareAllLiveStream;
+
+ /**
+ * 榛樿鐩綍Id,鑷姩娣诲姞鐨勯�氶亾澶氭斁鍦ㄨ繖涓洰褰曚笅
+ */
+ private String catalogId;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
public boolean isEnable() {
return enable;
@@ -220,12 +242,12 @@
this.characterSet = characterSet;
}
- public boolean isPTZEnable() {
- return PTZEnable;
+ public boolean isPtz() {
+ return ptz;
}
- public void setPTZEnable(boolean PTZEnable) {
- this.PTZEnable = PTZEnable;
+ public void setPtz(boolean ptz) {
+ this.ptz = ptz;
}
public boolean isRtcp() {
@@ -251,4 +273,21 @@
public void setChannelCount(int channelCount) {
this.channelCount = channelCount;
}
+
+
+ public boolean isShareAllLiveStream() {
+ return shareAllLiveStream;
+ }
+
+ public void setShareAllLiveStream(boolean shareAllLiveStream) {
+ this.shareAllLiveStream = shareAllLiveStream;
+ }
+
+ public String getCatalogId() {
+ return catalogId;
+ }
+
+ public void setCatalogId(String catalogId) {
+ this.catalogId = catalogId;
+ }
}
--
Gitblit v1.8.0