From b3c4636520e58c27a71409c764c2017c695682c1 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 20 三月 2023 14:40:17 +0800
Subject: [PATCH] 主线合并talk模式

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

diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
index 1c57d0b..8ef8c76 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
@@ -202,7 +202,7 @@
                     Map<String, Object> param = new HashMap<>();
                     param.put("vhost", "__defaultVhost__");
                     param.put("app", sendRtpItem.getApp());
-                    param.put("stream", sendRtpItem.getStreamId());
+                    param.put("stream", sendRtpItem.getStream());
                     zlmresTfulUtils.stopSendRtp(mediaInfo, param);
                 }
 
@@ -655,4 +655,9 @@
     public ResourceBaceInfo getOverview() {
         return deviceMapper.getOverview();
     }
+
+    @Override
+    public List<Device> getAll() {
+        return deviceMapper.getAll();
+    }
 }

--
Gitblit v1.8.0