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/media/zlm/dto/StreamPushItem.java | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
index 7a1c49b..1336807 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
@@ -9,6 +9,11 @@
public class StreamPushItem extends GbStream implements Comparable<StreamPushItem>{
/**
+ * id
+ */
+ private Integer id;
+
+ /**
* 搴旂敤鍚�
*/
private String app;
@@ -57,11 +62,6 @@
private String originUrl;
/**
- * GMT unix绯荤粺鏃堕棿鎴筹紝鍗曚綅绉�
- */
- private Long createStamp;
-
- /**
* 瀛樻椿鏃堕棿锛屽崟浣嶇
*/
private Long aliveSecond;
@@ -76,6 +76,11 @@
*/
private String vhost;
+ /**
+ * 浣跨敤鐨勬祦濯掍綋ID
+ */
+ private String mediaServerId;
+
public String getVhost() {
return vhost;
}
@@ -87,7 +92,7 @@
@Override
public int compareTo(@NotNull StreamPushItem streamPushItem) {
- return Long.valueOf(this.createStamp - streamPushItem.getCreateStamp().intValue()).intValue();
+ return Long.valueOf(super.createStamp - streamPushItem.getCreateStamp().intValue()).intValue();
}
public static class MediaSchema {
@@ -111,6 +116,13 @@
}
}
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
public String getApp() {
return app;
@@ -177,14 +189,6 @@
this.originUrl = originUrl;
}
- public Long getCreateStamp() {
- return createStamp;
- }
-
- public void setCreateStamp(Long createStamp) {
- this.createStamp = createStamp;
- }
-
public Long getAliveSecond() {
return aliveSecond;
}
@@ -202,5 +206,14 @@
}
+ @Override
+ public String getMediaServerId() {
+ return mediaServerId;
+ }
+
+ @Override
+ public void setMediaServerId(String mediaServerId) {
+ this.mediaServerId = mediaServerId;
+ }
}
--
Gitblit v1.8.0