From 6ba8ab22b54e83d0e0edabb9d0fdc8870b86e98f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 19 一月 2022 15:08:13 +0800
Subject: [PATCH] 修复推流生成通道未通知上级平台的问题，添加注册时清楚脏数据。
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
index baf0b3c..a6c30cf 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
@@ -7,6 +7,7 @@
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
+import com.genersoft.iot.vmp.service.IStreamProxyService;
import com.genersoft.iot.vmp.service.IStreamPushService;
import com.genersoft.iot.vmp.service.bean.ThirdPartyGB;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
@@ -46,6 +47,9 @@
@Autowired
private IStreamPushService streamPushService;
+
+ @Autowired
+ private IStreamProxyService streamProxyService;
@Autowired
private StreamPushMapper streamPushMapper;
@@ -101,7 +105,7 @@
updateMedia(mediaServerItem, app, streamId);
}
- public void addMedia(MediaItem mediaItem) {
+ public StreamPushItem addPush(MediaItem mediaItem) {
// 鏌ユ壘姝ょ洿鎾祦鏄惁瀛樺湪redis棰勮gbId
StreamPushItem transform = streamPushService.transform(mediaItem);
// 浠巗treamId鍙栧嚭鏌ヨ鍏抽敭鍊�
@@ -126,7 +130,6 @@
for (GbStream gbStream : gbStreams) {
// 鍑虹幇浣跨敤鐩稿悓鍥芥爣Id鐨勮棰戞祦鏃讹紝浣跨敤鏂版祦鏇挎崲鏃ф祦锛�
gbStreamMapper.del(gbStream.getApp(), gbStream.getStream());
- platformGbStreamMapper.delByAppAndStream(gbStream.getApp(), gbStream.getStream());
if (!gbStream.isStatus()) {
streamPushMapper.del(gbStream.getApp(), gbStream.getStream());
}
@@ -137,8 +140,8 @@
}else {
gbStreamMapper.add(transform);
}
-
}
+ return transform;
}
@@ -179,6 +182,8 @@
return result;
}
+
+
// public void clearAllSessions() {
// logger.info("娓呯┖鎵�鏈夊浗鏍囩浉鍏崇殑session");
// JSONObject allSessionJSON = zlmresTfulUtils.getAllSession();
--
Gitblit v1.8.0