From 49bedcce2ac42fa34da012ee3fc8e9230886064a Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期五, 12 七月 2024 15:28:24 +0800
Subject: [PATCH] 优化：流媒体
---
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java | 252 +++++++++++++++++++++-----------------------------
1 files changed, 107 insertions(+), 145 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java
index b7242fd..3e3a269 100644
--- a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java
@@ -1,25 +1,25 @@
package com.ruoyi.media.service.impl;
import com.alibaba.fastjson2.JSONObject;
-import com.dtflys.forest.Forest;
import com.dtflys.forest.exceptions.ForestNetworkException;
import com.dtflys.forest.exceptions.ForestRuntimeException;
-import com.dtflys.forest.http.ForestRequest;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.media.domain.*;
import com.ruoyi.media.service.IMediaService;
import com.ruoyi.utils.forest.MediaClient;
import com.ruoyi.utils.tools.ArdTool;
+import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
-import javax.annotation.PostConstruct;
import javax.annotation.Resource;
-import javax.xml.soap.SOAPEnvelope;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -34,22 +34,14 @@
@Service
@Slf4j(topic = "vtdu")
@Order(2)
-public class MediaServiceImpl implements IMediaService, ApplicationRunner {
- private static List<String> mediaNameList = new ArrayList<>();
+public class MediaServiceImpl implements IMediaService {
+
@Resource
MediaClient mediaClient;
@Value("${mediamtx.host}")
String mediamtxHost;
- @Override
- public void run(ApplicationArguments args) throws Exception {
- mediaNameList = getNameList();
- if(mediaNameList.size()>0)
- {
- removePath(mediaNameList.toArray(new String[0]));
- mediaNameList.clear();
- }
- }
+
/**
* 娣诲姞娴佸獟浣�
@@ -76,7 +68,7 @@
//榛樿杞В鐮�
String cmd = "ffmpeg -rtsp_transport tcp -i " + sourceUrl + " -vcodec libx264 -preset:v ultrafast -r 25 -keyint_min 25 -g 60 -sc_threshold 0 -threads 6 -b:v 2048k -acodec opus -strict -2 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
if (mode.equals("0")) {//纭В鐮�
- cmd = rootPath+"ffmpeg -hwaccel cuvid -c:v hevc_cuvid -rtsp_transport tcp -i " + sourceUrl + " -c:v h264_nvenc -r 25 -g 60 -sc_threshold 0 -threads 6 -b:v 2048k -bf 0 -acodec opus -strict -2 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
+ cmd = rootPath + "ffmpeg -hwaccel cuvid -c:v hevc_cuvid -rtsp_transport tcp -i " + sourceUrl + " -c:v h264_nvenc -r 25 -g 60 -sc_threshold 0 -threads 6 -b:v 2048k -bf 0 -acodec opus -strict -2 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
}
conf.setRunOnDemand(cmd);
conf.setRunOnDemandRestart(true);
@@ -89,7 +81,9 @@
conf.setSourceProtocol("tcp");
if (!checkNameExist(name)) {
- mediaClient.addPath(name, conf);
+ mediaClient.addPath(name, conf);
+ } else {
+ mediaClient.editPath(name, conf);
}
map.put("rtspUrl", rtspUrl);
@@ -156,6 +150,8 @@
if (StringUtils.isNotEmpty(conf.getRunOnDemand())) {
runOn = conf.getRunOnDemand();
info.setMode("0");
+ } else {
+ info.setMode("1");
}
//RTSP婧愬湴鍧�
Matcher matcher = Pattern.compile("rtsp://[^\\s\"]+").matcher(runOn);
@@ -171,11 +167,14 @@
@Override
public void removePath(String[] names) {
- for (String name : names) {
- if (checkNameExist(name)) {
- mediaClient.removePath(name);
- log.info("鍒犻櫎鎴愬姛");
+ try {
+ for (String name : names) {
+ if (checkNameExist(name)) {
+ mediaClient.removePath(name);
+ }
}
+ } catch (Exception ex) {
+ log.error("鎵归噺绉婚櫎娴佸獟浣撳紓甯革細" + ex.getMessage());
}
}
@@ -191,10 +190,9 @@
}
@Override
- public List<StreamInfo> paths() {
- String list = mediaClient.paths();
- JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
- List<Items> items = jsonsRoot.getItems();
+ public List<StreamInfo> paths(Integer pageNum, Integer pageSize) {
+ Paths paths = mediaClient.paths(pageNum - 1, pageSize);
+ List<Items> items = paths.getItems();
List<StreamInfo> pathInfoList = new ArrayList<>();
for (Items item : items) {
StreamInfo info = new StreamInfo();
@@ -229,23 +227,17 @@
@Override
public RtspSession getRtspSessionById(String sessionId) {
- String list = mediaClient.getRtspsessionById(sessionId);
- RtspSession rtspSession = JSONObject.parseObject(list, RtspSession.class);
- return rtspSession;
+ return mediaClient.getRtspsessionById(sessionId);
}
@Override
public WebrtcSession getWebrtcSessionById(String sessionId) {
- String list = mediaClient.getWebrtcsessionById(sessionId);
- WebrtcSession webrtcSession = JSONObject.parseObject(list, WebrtcSession.class);
- return webrtcSession;
+ return mediaClient.getWebrtcsessionById(sessionId);
}
@Override
public RtmpSession getRtmpSessionById(String sessionId) {
- String list = mediaClient.getRtmpsessionById(sessionId);
- RtmpSession rtmpSession = JSONObject.parseObject(list, RtmpSession.class);
- return rtmpSession;
+ return mediaClient.getRtmpsessionById(sessionId);
}
/**
@@ -254,11 +246,13 @@
* 2023/8/29 9:37:05
*/
@Override
- public List<StreamInfo> getPushStreamList() {
+ public TableDataInfo getPushStreamList(Integer pageNum, Integer pageSize) {
+ TableDataInfo tableDataInfo = new TableDataInfo();
List<StreamInfo> PushStreamInfoList = new ArrayList<>();
- String list = mediaClient.paths();
- JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
- List<Items> items = jsonsRoot.getItems();
+ Paths paths = mediaClient.paths(pageNum - 1, pageSize);
+ int itemCount = paths.getItemCount();
+ tableDataInfo.setTotal(itemCount);
+ List<Items> items = paths.getItems();
for (Items item : items) {
StreamInfo info = new StreamInfo();
//ID
@@ -284,6 +278,7 @@
long bytesReceived = item.getBytesReceived();
String formatReceivedSize = ArdTool.formatFileSize(bytesReceived);
info.setUpTraffic(formatReceivedSize);
+ info.setBeginTime(item.getReadyTime());
} else {
RtspSession rtspSession = getRtspSessionById(source.getId());
//浼氳瘽ID
@@ -320,105 +315,82 @@
PushStreamInfoList.add(info);
}
- return PushStreamInfoList;
+ tableDataInfo.setRows(PushStreamInfoList);
+ tableDataInfo.setCode(HttpStatus.SUCCESS);
+ tableDataInfo.setMsg("鏌ヨ鎴愬姛");
+ return tableDataInfo;
}
/**
- * 鑾峰彇鎷夋祦鍒楄〃
+ * 鑾峰彇webrtc鎷夋祦鍒楄〃
* 鍒樿嫃涔�
* 2023/8/29 9:37:05
*/
@Override
- public List<StreamInfo> getPullStreamList() {
- List<StreamInfo> PullStreamInfoList = new ArrayList<>();
- String list = mediaClient.paths();
- JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
- List<Items> items = jsonsRoot.getItems();
- for (Items item : items) {
- List<Readers> readers = item.getReaders();
- for (Readers reader : readers) {
- StreamInfo info = new StreamInfo();
- //ID
- String name = item.getName();
- info.setName(name);
- Conf conf = mediaClient.getPathInfo(name);
- //浼犺緭鍗忚
- info.setProtocol(conf.getSourceProtocol());
-
- String type = reader.getType();
- switch (type) {
- case "rtmpConn":
- info.setSessionType("rtmp");
- //webrtc鎾斁鍦板潃
- String url = "rtmp://" + mediamtxHost + ":1935/" + name;
- info.setRtspUrl(url);
- RtmpSession rtmpSession = getRtmpSessionById(reader.getId());
- //浼氳瘽ID
- info.setId(rtmpSession.getId());
- //寮�濮嬫媺娴佹椂闂�
- info.setBeginTime(rtmpSession.getCreated());
- //涓婅娴侀噺
- long bytesReceived = rtmpSession.getBytesReceived();
- String formatReceivedSize = ArdTool.formatFileSize(bytesReceived);
- info.setUpTraffic(formatReceivedSize);
- //涓嬭娴侀噺
- long bytesSent = rtmpSession.getBytesSent();
- String formatSentSize = ArdTool.formatFileSize(bytesSent);
- info.setDownTraffic(formatSentSize);
- //鎷夋祦鏈嶅姟鍣�
- info.setRemoteAddr(rtmpSession.getRemoteAddr());
- PullStreamInfoList.add(info);
- break;
- case "webRTCSession":
- info.setSessionType("webrtc");
- //webrtc鎾斁鍦板潃
- url = "http://" + mediamtxHost + ":8889/" + name;
- info.setRtspUrl(url);
- WebrtcSession webrtcSession = getWebrtcSessionById(reader.getId());
- //浼氳瘽ID
- info.setId(webrtcSession.getId());
- //寮�濮嬫媺娴佹椂闂�
- info.setBeginTime(webrtcSession.getCreated());
- //涓婅娴侀噺
- bytesReceived = webrtcSession.getBytesReceived();
- formatReceivedSize = ArdTool.formatFileSize(bytesReceived);
- info.setUpTraffic(formatReceivedSize);
- //涓嬭娴侀噺
- bytesSent = webrtcSession.getBytesSent();
- formatSentSize = ArdTool.formatFileSize(bytesSent);
- info.setDownTraffic(formatSentSize);
- //鎷夋祦鏈嶅姟鍣�
- info.setRemoteAddr(webrtcSession.getRemoteAddr());
- PullStreamInfoList.add(info);
- break;
- case "rtspSession":
- info.setSessionType("rtsp");
- //RTSP鎾斁鍦板潃
- String rtspUrl = "rtsp://" + mediamtxHost + ":8554/" + name;
- info.setRtspUrl(rtspUrl);
- RtspSession rtspSession = getRtspSessionById(reader.getId());
- //浼氳瘽ID
- info.setId(rtspSession.getId());
- //寮�濮嬫媺娴佹椂闂�
- info.setBeginTime(rtspSession.getCreated());
- //涓婅娴侀噺
- bytesReceived = rtspSession.getBytesReceived();
- formatReceivedSize = ArdTool.formatFileSize(bytesReceived);
- info.setUpTraffic(formatReceivedSize);
- //涓嬭娴侀噺
- bytesSent = rtspSession.getBytesSent();
- formatSentSize = ArdTool.formatFileSize(bytesSent);
- info.setDownTraffic(formatSentSize);
- //鎷夋祦鏈嶅姟鍣�
- info.setRemoteAddr(rtspSession.getRemoteAddr());
- PullStreamInfoList.add(info);
- break;
+ public TableDataInfo getPullWebrtcStreamList(Integer pageNum, Integer pageSize) {
+ TableDataInfo tableDataInfo = new TableDataInfo();
+ WebrtcSessions WebrtcSessions = mediaClient.webrtcsessions(pageNum-1, pageSize);
+ List<WebrtcSession> webrtcsessions = WebrtcSessions.getItems();
+ webrtcsessions.stream().forEach(
+ webrtcSession -> {
+ webrtcSession.setUpStream(ArdTool.formatFileSize(webrtcSession.getBytesReceived()));
+ webrtcSession.setDownStream(ArdTool.formatFileSize(webrtcSession.getBytesSent()));
+ webrtcSession.setBeginTime(webrtcSession.getCreated());
}
- }
- }
- Comparator<StreamInfo> comparator = Comparator.comparing(streamInfo -> streamInfo.getBeginTime()); // 浣跨敤Collections.sort鏂规硶杩涜鎺掑簭 Collections.sort(personList, comparator);
- Collections.sort(PullStreamInfoList, comparator.reversed());
- return PullStreamInfoList;
+ );
+ tableDataInfo.setTotal(WebrtcSessions.getItemCount());
+ tableDataInfo.setRows(webrtcsessions);
+ tableDataInfo.setCode(HttpStatus.SUCCESS);
+ tableDataInfo.setMsg("鏌ヨ鎴愬姛");
+ return tableDataInfo;
+ }
+
+ /**
+ * 鑾峰彇rtmp鎷夋祦鍒楄〃
+ * 鍒樿嫃涔�
+ * 2023/8/29 9:37:05
+ */
+ @Override
+ public TableDataInfo getPullRtmpStreamList(Integer pageNum, Integer pageSize) {
+ TableDataInfo tableDataInfo = new TableDataInfo();
+ RtmpSessions rtmpSessions = mediaClient.rtmpsessions(pageNum-1, pageSize);
+ List<RtmpSession> webrtcsessions = rtmpSessions.getItems();
+ webrtcsessions.stream().forEach(
+ webrtcSession -> {
+ webrtcSession.setUpStream(ArdTool.formatFileSize(webrtcSession.getBytesReceived()));
+ webrtcSession.setDownStream(ArdTool.formatFileSize(webrtcSession.getBytesSent()));
+ webrtcSession.setBeginTime(webrtcSession.getCreated());
+ }
+ );
+ tableDataInfo.setTotal(rtmpSessions.getItemCount());
+ tableDataInfo.setRows(webrtcsessions);
+ tableDataInfo.setCode(HttpStatus.SUCCESS);
+ tableDataInfo.setMsg("鏌ヨ鎴愬姛");
+ return tableDataInfo;
+ }
+
+ /**
+ * 鑾峰彇rtsp鎷夋祦鍒楄〃
+ * 鍒樿嫃涔�
+ * 2023/8/29 9:37:05
+ */
+ @Override
+ public TableDataInfo getPullRtspStreamList(Integer pageNum, Integer pageSize) {
+ TableDataInfo tableDataInfo = new TableDataInfo();
+ RtspSessions rtspSessions = mediaClient.rtspsessions(pageNum-1, pageSize);
+ List<RtspSession> webrtcsessions = rtspSessions.getItems();
+ webrtcsessions.stream().forEach(
+ webrtcSession -> {
+ webrtcSession.setUpStream(ArdTool.formatFileSize(webrtcSession.getBytesReceived()));
+ webrtcSession.setDownStream(ArdTool.formatFileSize(webrtcSession.getBytesSent()));
+ webrtcSession.setBeginTime(webrtcSession.getCreated());
+ }
+ );
+ tableDataInfo.setTotal(rtspSessions.getItemCount());
+ tableDataInfo.setRows(webrtcsessions);
+ tableDataInfo.setCode(HttpStatus.SUCCESS);
+ tableDataInfo.setMsg("鏌ヨ鎴愬姛");
+ return tableDataInfo;
}
/**
@@ -475,40 +447,30 @@
public List<String> getNameList() {
List<String> nameList = new ArrayList<>();
try {
- String paths = mediaClient.paths();
- JsonsRoot jsonsRoot = JSONObject.parseObject(paths, JsonsRoot.class);
- List<Items> items = jsonsRoot.getItems();
+ Paths paths = mediaClient.paths(0, 1000);
+ List<Items> items = paths.getItems();
for (Items item : items) {
nameList.add(item.getName());
}
- } catch (ForestNetworkException ex) {
- log.error("鑾峰彇娴佸獟浣搉ame鍒楄〃寮傚父锛�" + ex.getMessage());
- } catch (ForestRuntimeException ex) {
+ } catch (Exception ex) {
log.error("鑾峰彇娴佸獟浣搉ame鍒楄〃寮傚父锛�" + ex.getMessage());
}
return nameList;
}
/**
- * 妫�鏌ュ悕绉版槸鍚﹀瓨鍦�
+ * 妫�鏌ame鏄惁瀛樺湪
* 鍒樿嫃涔�
* 2023/10/19 15:18:45
*/
@Override
public boolean checkNameExist(String name) {
boolean result = false;
- if (mediaNameList.contains(name)) {
+ List<String> nameList = getNameList();
+ if (nameList.contains(name)) {
result = true;
}
return result;
- }
-
- /**
- * 閰嶇疆娴佸獟浣撳弬鏁�
- */
- @Override
- public String setConfig(Config config) {
- return mediaClient.setConfig(config);
}
--
Gitblit v1.9.3