From 4a293865ac437a812eea8800cc0b04314efbd210 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 24 十月 2023 10:06:24 +0800
Subject: [PATCH] 异步登录增加延迟时间避免接口频繁 修改大华通道数量获取
---
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java | 96 ++++++++++++++++++++++++++++--------------------
1 files changed, 56 insertions(+), 40 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 c0326e2..81be80e 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
@@ -2,6 +2,7 @@
import com.alibaba.fastjson2.JSONObject;
import com.dtflys.forest.exceptions.ForestNetworkException;
+import com.dtflys.forest.exceptions.ForestRuntimeException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.media.domain.*;
import com.ruoyi.media.service.IMediaService;
@@ -25,7 +26,7 @@
* @Version: 1.0
**/
@Service
-@Slf4j(topic = "cmd")
+@Slf4j(topic = "vtdu")
@Order(2)
public class MediaServiceImpl implements IMediaService {
@@ -47,37 +48,41 @@
*/
@Override
public Map<String, String> addPath(String name, String sourceUrl, String mode, String isCode) {
-
- String rtspUrl = "rtsp://" + mediamtxHost + ":8554/" + name;
- String rtmpUrl = "rtmp://" + mediamtxHost + ":1935/" + name;
- String webrtcUrl = "http://" + mediamtxHost + ":8889/" + name;
-
- Conf conf = new Conf();
- String rootPath = System.getProperty("user.dir").replaceAll("\\\\", "/") + "/lib/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";
- }
- conf.setRunOnDemand(cmd);
- conf.setRunOnDemandRestart(true);
- conf.setRunOnDemandCloseAfter("5s");
- } else {
- conf.setSource(sourceUrl);
- conf.setSourceOnDemand(true);
- }
- conf.setMaxReaders(100);
- conf.setSourceProtocol("tcp");
-
- if (!checkNameExist(name)) {
- mediaClient.addPath(name, conf);
- }
Map<String, String> map = new HashMap<>();
- map.put("rtspUrl", rtspUrl);
- map.put("rtmpUrl", rtmpUrl);
- map.put("webrtcUrl", webrtcUrl);
+ try {
+ String rtspUrl = "rtsp://" + mediamtxHost + ":8554/" + name;
+ String rtmpUrl = "rtmp://" + mediamtxHost + ":1935/" + name;
+ String webrtcUrl = "http://" + mediamtxHost + ":8889/" + name;
+
+ Conf conf = new Conf();
+ String rootPath = System.getProperty("user.dir").replaceAll("\\\\", "/") + "/lib/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";
+ }
+ conf.setRunOnDemand(cmd);
+ conf.setRunOnDemandRestart(true);
+ conf.setRunOnDemandCloseAfter("5s");
+ } else {
+ conf.setSource(sourceUrl);
+ conf.setSourceOnDemand(true);
+ }
+ conf.setMaxReaders(100);
+ conf.setSourceProtocol("tcp");
+
+ if (!checkNameExist(name)) {
+ mediaClient.addPath(name, conf);
+ }
+
+ map.put("rtspUrl", rtspUrl);
+ map.put("rtmpUrl", rtmpUrl);
+ map.put("webrtcUrl", webrtcUrl);
+ } catch (ForestRuntimeException ex) {
+ log.error("娣诲姞娴佸獟浣撳紓甯革細"+ex.getMessage());
+ }
return map;
}
@@ -118,8 +123,8 @@
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());
}
return map;
}
@@ -158,8 +163,12 @@
@Override
public void removePath(String name) {
- if (checkNameExist(name)) {
- mediaClient.removePath(name);
+ try {
+ if (checkNameExist(name)) {
+ mediaClient.removePath(name);
+ }
+ } catch (ForestRuntimeException ex) {
+ log.error("绉婚櫎娴佸獟浣撳紓甯革細"+ex.getMessage());
}
}
@@ -447,11 +456,18 @@
@Override
public List<String> getNameList() {
List<String> nameList = new ArrayList<>();
- String paths = mediaClient.paths();
- JsonsRoot jsonsRoot = JSONObject.parseObject(paths, JsonsRoot.class);
- List<Items> items = jsonsRoot.getItems();
- for (Items item : items) {
- nameList.add(item.getName());
+ 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());
+ }
+ }catch (ForestNetworkException ex) {
+ log.error("鑾峰彇娴佸獟浣搉ame鍒楄〃寮傚父锛�"+ex.getMessage());
+ }
+ catch (ForestRuntimeException ex) {
+ log.error("鑾峰彇娴佸獟浣搉ame鍒楄〃寮傚父锛�"+ex.getMessage());
}
return nameList;
}
--
Gitblit v1.9.3