From f58290cad307c9bb8018ae53cf2bf93bbe9d7bf5 Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期一, 26 七月 2021 17:53:02 +0800
Subject: [PATCH] 更新版本信息
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 46 insertions(+), 13 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 3b7428a..7fc0a08 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
@@ -1,9 +1,9 @@
package com.genersoft.iot.vmp.media.zlm;
import com.alibaba.fastjson.JSONObject;
+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.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.service.IStreamPushService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
@@ -16,6 +16,7 @@
import java.util.*;
+@SuppressWarnings("unchecked")
@Component
public class ZLMMediaListManager {
@@ -43,11 +44,11 @@
private ZLMHttpHookSubscribe subscribe;
- public void updateMediaList() {
+ public void updateMediaList(MediaServerItem mediaServerItem) {
storager.clearMediaList();
// 浣跨敤寮傛鐨勫綋鏃舵洿鏂板獟浣撴祦鍒楄〃
- zlmresTfulUtils.getMediaList((mediaList ->{
+ zlmresTfulUtils.getMediaList(mediaServerItem, (mediaList ->{
if (mediaList == null) return;
String dataStr = mediaList.getString("data");
@@ -55,10 +56,10 @@
Map<String, StreamPushItem> result = new HashMap<>();
List<StreamPushItem> streamPushItems = null;
// 鑾峰彇鎵�鏈夌殑鍥芥爣鍏宠仈
- List<GbStream> gbStreams = gbStreamMapper.selectAll();
+// List<GbStream> gbStreams = gbStreamMapper.selectAllByMediaServerId(mediaServerItem.getId());
if (code == 0 ) {
if (dataStr != null) {
- streamPushItems = streamPushService.handleJSON(dataStr);
+ streamPushItems = streamPushService.handleJSON(dataStr, mediaServerItem);
}
}else {
logger.warn("鏇存柊瑙嗛娴佸け璐ワ紝閿欒code锛� " + code);
@@ -70,24 +71,27 @@
JSONObject jsonObject = new JSONObject();
jsonObject.put("app", streamPushItem.getApp());
jsonObject.put("stream", streamPushItem.getStream());
- subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_play,jsonObject,(response)->{
- updateMedia(response.getString("app"), response.getString("stream"));
- });
+ jsonObject.put("mediaServerId", mediaServerItem.getId());
+ subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_play,jsonObject,
+ (MediaServerItem mediaServerItemInuse, JSONObject response)->{
+ updateMedia(mediaServerItem, response.getString("app"), response.getString("stream"));
+ }
+ );
}
}
}));
}
- public void addMedia(String app, String streamId) {
+ public void addMedia(MediaServerItem mediaServerItem, String app, String streamId) {
//浣跨敤寮傛鏇存柊鎺ㄦ祦
- updateMedia(app, streamId);
+ updateMedia(mediaServerItem, app, streamId);
}
- public void updateMedia(String app, String streamId) {
+ public void updateMedia(MediaServerItem mediaServerItem, String app, String streamId) {
//浣跨敤寮傛鏇存柊鎺ㄦ祦
- zlmresTfulUtils.getMediaList(app, streamId, "rtmp", json->{
+ zlmresTfulUtils.getMediaList(mediaServerItem, app, streamId, "rtmp", json->{
if (json == null) return;
String dataStr = json.getString("data");
@@ -97,7 +101,7 @@
List<StreamPushItem> streamPushItems = null;
if (code == 0 ) {
if (dataStr != null) {
- streamPushItems = streamPushService.handleJSON(dataStr);
+ streamPushItems = streamPushService.handleJSON(dataStr, mediaServerItem);
}
}else {
logger.warn("鏇存柊瑙嗛娴佸け璐ワ紝閿欒code锛� " + code);
@@ -119,4 +123,33 @@
storager.mediaOutline(app, streamId);
}
}
+
+// public void clearAllSessions() {
+// logger.info("娓呯┖鎵�鏈夊浗鏍囩浉鍏崇殑session");
+// JSONObject allSessionJSON = zlmresTfulUtils.getAllSession();
+// ZLMServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
+// HashSet<String> allLocalPorts = new HashSet();
+// if (allSessionJSON.getInteger("code") == 0) {
+// JSONArray data = allSessionJSON.getJSONArray("data");
+// if (data.size() > 0) {
+// for (int i = 0; i < data.size(); i++) {
+// JSONObject sessionJOSN = data.getJSONObject(i);
+// Integer local_port = sessionJOSN.getInteger("local_port");
+// if (!local_port.equals(Integer.valueOf(mediaInfo.getHttpPort())) &&
+// !local_port.equals(Integer.valueOf(mediaInfo.getHttpSSLport())) &&
+// !local_port.equals(Integer.valueOf(mediaInfo.getRtmpPort())) &&
+// !local_port.equals(Integer.valueOf(mediaInfo.getRtspPort())) &&
+// !local_port.equals(Integer.valueOf(mediaInfo.getRtspSSlport())) &&
+// !local_port.equals(Integer.valueOf(mediaInfo.getHookOnFlowReport()))){
+// allLocalPorts.add(sessionJOSN.getInteger("local_port") + "");
+// }
+// }
+// }
+// }
+// if (allLocalPorts.size() > 0) {
+// List<String> result = new ArrayList<>(allLocalPorts);
+// String localPortSStr = String.join(",", result);
+// zlmresTfulUtils.kickSessions(localPortSStr);
+// }
+// }
}
--
Gitblit v1.8.0