From d937694a31415d25826d515cb4b6c77974c821fa Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 27 三月 2024 10:42:04 +0800
Subject: [PATCH] 雷达在线注释掉
---
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java | 62 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 20 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 81be80e..eee6a8b 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,8 +1,10 @@
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.utils.StringUtils;
import com.ruoyi.media.domain.*;
import com.ruoyi.media.service.IMediaService;
@@ -10,10 +12,14 @@
import com.ruoyi.utils.tools.ArdTool;
import lombok.extern.slf4j.Slf4j;
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;
@@ -28,13 +34,22 @@
@Service
@Slf4j(topic = "vtdu")
@Order(2)
-public class MediaServiceImpl implements IMediaService {
-
+public class MediaServiceImpl implements IMediaService, ApplicationRunner {
+ public static List<String> mediaNameList = new ArrayList<>();
@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();
+ }
+ }
/**
* 娣诲姞娴佸獟浣�
@@ -55,13 +70,13 @@
String webrtcUrl = "http://" + mediamtxHost + ":8889/" + name;
Conf conf = new Conf();
- String rootPath = System.getProperty("user.dir").replaceAll("\\\\", "/") + "/lib/mediamtx/";
+ String rootPath = System.getProperty("user.dir").replaceAll("\\\\", "/") + "/server/mediamtx/";
if (isCode.equals("1")) {
conf.setSource("publisher");
//榛樿杞В鐮�
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 = "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);
@@ -75,13 +90,16 @@
if (!checkNameExist(name)) {
mediaClient.addPath(name, conf);
+ mediaNameList.add(name);
}
map.put("rtspUrl", rtspUrl);
map.put("rtmpUrl", rtmpUrl);
map.put("webrtcUrl", webrtcUrl);
+ } catch (ForestNetworkException ex) {
+ log.error("娣诲姞娴佸獟浣撳紓甯革細" + ex.getMessage());
} catch (ForestRuntimeException ex) {
- log.error("娣诲姞娴佸獟浣撳紓甯革細"+ex.getMessage());
+ log.error("娣诲姞娴佸獟浣撳紓甯革細" + ex.getMessage());
}
return map;
}
@@ -124,7 +142,7 @@
map.put("rtmpUrl", rtmpUrl);
map.put("webrtcUrl", webrtcUrl);
} catch (ForestRuntimeException ex) {
- log.error("淇敼娴佸獟浣撳紓甯革細"+ex.getMessage());
+ log.error("淇敼娴佸獟浣撳紓甯革細" + ex.getMessage());
}
return map;
}
@@ -154,10 +172,14 @@
@Override
public void removePath(String[] names) {
- for (String name : names) {
- if (checkNameExist(name)) {
- mediaClient.removePath(name);
+ try {
+ for (String name : names) {
+ if (checkNameExist(name)) {
+ mediaClient.removePath(name);
+ }
}
+ } catch (Exception ex) {
+ log.error("鎵归噺绉婚櫎娴佸獟浣撳紓甯革細" + ex.getMessage());
}
}
@@ -166,9 +188,10 @@
try {
if (checkNameExist(name)) {
mediaClient.removePath(name);
+ mediaNameList.remove(name);
}
} catch (ForestRuntimeException ex) {
- log.error("绉婚櫎娴佸獟浣撳紓甯革細"+ex.getMessage());
+ log.error("绉婚櫎娴佸獟浣撳紓甯革細" + ex.getMessage());
}
}
@@ -455,21 +478,19 @@
*/
@Override
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();
for (Items item : items) {
- nameList.add(item.getName());
+ mediaNameList.add(item.getName());
}
- }catch (ForestNetworkException ex) {
- log.error("鑾峰彇娴佸獟浣搉ame鍒楄〃寮傚父锛�"+ex.getMessage());
+ } catch (ForestNetworkException ex) {
+ log.error("鑾峰彇娴佸獟浣搉ame鍒楄〃寮傚父锛�" + ex.getMessage());
+ } catch (ForestRuntimeException ex) {
+ log.error("鑾峰彇娴佸獟浣搉ame鍒楄〃寮傚父锛�" + ex.getMessage());
}
- catch (ForestRuntimeException ex) {
- log.error("鑾峰彇娴佸獟浣搉ame鍒楄〃寮傚父锛�"+ex.getMessage());
- }
- return nameList;
+ return mediaNameList;
}
/**
@@ -480,8 +501,7 @@
@Override
public boolean checkNameExist(String name) {
boolean result = false;
- List<String> nameList = getNameList();
- if (nameList.contains(name)) {
+ if (mediaNameList.contains(name)) {
result = true;
}
return result;
@@ -494,4 +514,6 @@
public String setConfig(Config config) {
return mediaClient.setConfig(config);
}
+
+
}
--
Gitblit v1.9.3