From 497e581e5e26840400f5f2cd1cf083c3de5e66c2 Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期一, 27 九月 2021 15:36:41 +0800
Subject: [PATCH] 处理报警和位置上报时使用fromHeader获取deviceId, xml的deviceId作为channelId使用。

---
 src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
index 9310320..fea3123 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
@@ -155,7 +155,7 @@
             SSRCInfo ssrcInfo;
             String streamId = null;
             if (mediaServerItem.isRtpEnable()) {
-                streamId = String.format("%s/%s", device.getDeviceId(), channelId);
+                streamId = String.format("%s_%s", device.getDeviceId(), channelId);
             }
 
             ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId);
@@ -220,7 +220,7 @@
                 SSRCInfo ssrcInfo;
                 String streamId2 = null;
                 if (mediaServerItem.isRtpEnable()) {
-                    streamId2 = String.format("%s/%s", device.getDeviceId(), channelId);
+                    streamId2 = String.format("%s_%s", device.getDeviceId(), channelId);
                 }
                 ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId2);
 
@@ -261,7 +261,7 @@
 
             WVPResult wvpResult = new WVPResult();
             wvpResult.setCode(0);
-            wvpResult.setMsg("sucess");
+            wvpResult.setMsg("success");
             wvpResult.setData(streamInfo);
             msg.setData(wvpResult);
 

--
Gitblit v1.8.0