From cb8011909063b330f5da6cdb03c2e329b97b18a2 Mon Sep 17 00:00:00 2001
From: 朱俊杰 <502612493@qq.com>
Date: 星期四, 31 三月 2022 09:19:45 +0800
Subject: [PATCH] 订阅查询错误和空指针
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 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 f185d82..fa4aa35 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
@@ -105,7 +105,7 @@
updateMedia(mediaServerItem, app, streamId);
}
- public void addPush(MediaItem mediaItem) {
+ public StreamPushItem addPush(MediaItem mediaItem) {
// 鏌ユ壘姝ょ洿鎾祦鏄惁瀛樺湪redis棰勮gbId
StreamPushItem transform = streamPushService.transform(mediaItem);
// 浠巗treamId鍙栧嚭鏌ヨ鍏抽敭鍊�
@@ -122,27 +122,44 @@
transform.setName(thirdPartyGB.getName());
}
}
- storager.updateMedia(transform);
if (!StringUtils.isEmpty(transform.getGbId())) {
// 濡傛灉杩欎釜鍥芥爣ID宸茬粡缁欎簡鍏朵粬鎺ㄦ祦涓旀祦宸茬绾匡紝鍒欑Щ闄ゅ叾浠栨帹娴�
List<GbStream> gbStreams = gbStreamMapper.selectByGBId(transform.getGbId());
if (gbStreams.size() > 0) {
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());
+ if (queryKey != null && gbStream.getApp().equals(mediaItem.getApp())) {
+ Matcher matcherForStream = pattern.matcher(gbStream.getStream());
+ String queryKeyForStream = null;
+ if (matcherForStream.find()) { //姝ゅfind锛堬級姣忔琚皟鐢ㄥ悗锛屼細鍋忕Щ鍒颁笅涓�涓尮閰�
+ queryKeyForStream = matcherForStream.group();
+ }
+ if (queryKeyForStream == null || !queryKeyForStream.equals(queryKey)) {
+ // 姝ゆ椂涓嶆槸鍚屼竴涓祦
+ gbStreamMapper.del(gbStream.getApp(), gbStream.getStream());
+ if (!gbStream.isStatus()) {
+ streamPushMapper.del(gbStream.getApp(), gbStream.getStream());
+ }
+ }
}
}
}
- if (gbStreamMapper.selectOne(transform.getApp(), transform.getStream()) != null) {
+ // StreamProxyItem streamProxyItem = gbStreamMapper.selectOne(transform.getApp(), transform.getStream());
+ List<GbStream> gbStreamList = gbStreamMapper.selectByGBId(transform.getGbId());
+ if (gbStreamList != null && gbStreamList.size() == 1) {
+ transform.setGbStreamId(gbStreamList.get(0).getGbStreamId());
+ transform.setPlatformId(gbStreamList.get(0).getPlatformId());
+ transform.setCatalogId(gbStreamList.get(0).getCatalogId());
+ transform.setGbId(gbStreamList.get(0).getGbId());
gbStreamMapper.update(transform);
+ streamPushMapper.del(gbStreamList.get(0).getApp(), gbStreamList.get(0).getStream());
}else {
+ transform.setCreateStamp(System.currentTimeMillis());
gbStreamMapper.add(transform);
}
-
}
+ storager.updateMedia(transform);
+ return transform;
}
--
Gitblit v1.8.0