From dd07cafb1604f528fbb7a04a79fc89b55198e080 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 08 七月 2024 16:24:15 +0800
Subject: [PATCH] 电子围栏挂接bug修改提交
---
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java | 200 +++++++++++++++++++++++++++----------------------
1 files changed, 109 insertions(+), 91 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 bbd910c..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
@@ -4,28 +4,22 @@
import com.dtflys.forest.Forest;
import com.dtflys.forest.exceptions.ForestNetworkException;
import com.dtflys.forest.exceptions.ForestRuntimeException;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.dtflys.forest.http.ForestRequest;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.media.domain.*;
-import com.ruoyi.media.mapper.VtduMapper;
import com.ruoyi.media.service.IMediaService;
import com.ruoyi.utils.forest.MediaClient;
import com.ruoyi.utils.tools.ArdTool;
-import com.ruoyi.utils.process.CmdUtils;
-import com.sun.jna.Platform;
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.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
import javax.annotation.Resource;
-import java.io.File;
+import javax.xml.soap.SOAPEnvelope;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -38,15 +32,24 @@
* @Version: 1.0
**/
@Service
-@Slf4j(topic = "cmd")
+@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();
+ }
+ }
/**
* 娣诲姞娴佸獟浣�
@@ -60,44 +63,44 @@
*/
@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 mediaInfo = new Conf();
- String rootPath = System.getProperty("user.dir").replaceAll("\\\\", "/") + "/lib/mediamtx/";
- if (isCode.equals("1")) {
- mediaInfo.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";
- }
- mediaInfo.setRunondemand(cmd);
- mediaInfo.setRunondemandrestart(true);
- mediaInfo.setRunondemandcloseafter("5s");
- } else {
- mediaInfo.setSource(sourceUrl);
- mediaInfo.setSourceondemand(true);
- }
- mediaInfo.setMaxReaders(100);
- mediaInfo.setSourceprotocol("tcp");
-
- 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());
- }
- if (!nameList.contains(name)) {
- mediaClient.addPath(name, mediaInfo);
- }
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("\\\\", "/") + "/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 = 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);
+ conf.setRunOnDemandCloseAfter("5s");
+ } else {
+ conf.setSource(sourceUrl);
+ conf.setSourceOnDemand(true);
+ }
+ conf.setMaxReaders(100);
+ conf.setSourceProtocol("tcp");
+
+ 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());
+ }
return map;
}
@@ -109,51 +112,51 @@
String rtmpUrl = "rtmp://" + mediamtxHost + ":1935/" + name;
String webrtcUrl = "http://" + mediamtxHost + ":8889/" + name;
- Conf mediaInfo = new Conf();
+ Conf conf = new Conf();
String rootPath = System.getProperty("user.dir").replaceAll("\\\\", "/") + "/lib/mediamtx/";
if (isCode.equals("1")) {
- mediaInfo.setSource("publisher");
+ 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";
}
- mediaInfo.setRunondemand(cmd);
- mediaInfo.setRunondemandrestart(true);
- mediaInfo.setRunondemandcloseafter("5s");
+ conf.setRunOnDemand(cmd);
+ conf.setRunOnDemandRestart(true);
+ conf.setRunOnDemandCloseAfter("5s");
} else {
- mediaInfo.setSource(sourceUrl);
+ conf.setSource(sourceUrl);
+ conf.setSourceOnDemand(true);
+ conf.setRunOnDemand("");
+ conf.setRunOnDemandRestart(false);
+ conf.setRunOnDemandCloseAfter("5s");
}
- mediaInfo.setMaxReaders(100);
- mediaInfo.setSourceprotocol("tcp");
+ conf.setMaxReaders(100);
+ conf.setSourceProtocol("tcp");
if (checkNameExist(name)) {
- mediaClient.editPath(name, mediaInfo);
+ mediaClient.editPath(name, conf);
}
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;
}
@Override
public StreamInfo getPathInfo(String name) {
- Items item = mediaClient.getPathInfo(name);
+ Conf conf = mediaClient.getPathInfo(name);
StreamInfo info = new StreamInfo();
//ID
info.setName(name);
- String runOn;
- if (StringUtils.isNotEmpty(item.getConf().getRunondemand())) {
- runOn = item.getConf().getRunondemand();
+ String runOn = "";
+ if (StringUtils.isNotEmpty(conf.getRunOnDemand())) {
+ runOn = conf.getRunOnDemand();
info.setMode("0");
- } else {
- //runOn = item.getConf().getRunonready();
- runOn = item.getConf().getRunoninit();
- info.setMode("1");
}
//RTSP婧愬湴鍧�
Matcher matcher = Pattern.compile("rtsp://[^\\s\"]+").matcher(runOn);
@@ -161,7 +164,7 @@
info.setRtspSource(matcher.group());
info.setIsCode("1");
} else {
- info.setRtspSource(item.getConf().getSource());
+ info.setRtspSource(conf.getSource());
info.setIsCode("0");
}
return info;
@@ -169,16 +172,26 @@
@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());
}
}
@Override
public void removePath(String name) {
- if(checkNameExist(name)) {
- mediaClient.removePath(name);
+ try {
+ if (checkNameExist(name)) {
+ mediaClient.removePath(name);
+ mediaNameList.remove(name);
+ }
+ } catch (ForestRuntimeException ex) {
+ log.error("绉婚櫎娴佸獟浣撳紓甯革細" + ex.getMessage());
}
}
@@ -193,9 +206,11 @@
//ID
String name = item.getName();
info.setName(name);
+
+ Conf conf = mediaClient.getPathInfo(name);
String runOn = "";
- if (StringUtils.isNotEmpty(item.getConf().getRunondemand())) {
- runOn = item.getConf().getRunondemand();
+ if (StringUtils.isNotEmpty(conf.getRunOnDemand())) {
+ runOn = conf.getRunOnDemand();
}
//RTSP婧愬湴鍧�
Matcher matcher = Pattern.compile("rtsp://[^\\s\"]+").matcher(runOn);
@@ -203,7 +218,7 @@
info.setRtspSource(matcher.group());
info.setIsCode("1");
} else {
- info.setRtspSource(item.getConf().getSource());
+ info.setRtspSource(conf.getSource());
info.setIsCode("0");
}
//浼犺緭鍗忚
@@ -216,7 +231,6 @@
}
return pathInfoList;
}
-
@Override
public RtspSession getRtspSessionById(String sessionId) {
@@ -255,6 +269,9 @@
//ID
String name = item.getName();
info.setName(name);
+
+ Conf conf = mediaClient.getPathInfo(name);
+
//RTMP鎾斁鍦板潃
String rtmpUrl = "rtmp://" + mediamtxHost + ":1935/" + name;
info.setRtmpUrl(rtmpUrl);
@@ -291,17 +308,17 @@
}
//RTSP婧愬湴鍧�
String runOn = "";
- if (StringUtils.isNotEmpty(item.getConf().getRunondemand())) {
- runOn = item.getConf().getRunondemand();
+ if (StringUtils.isNotEmpty(conf.getRunOnDemand())) {
+ runOn = conf.getRunOnDemand();
}
Matcher matcher = Pattern.compile("rtsp://[^\\s\"]+").matcher(runOn);
if (matcher.find()) {
info.setRtspSource(matcher.group());
} else {
- info.setRtspSource(item.getConf().getSource());
+ info.setRtspSource(conf.getSource());
}
//浼犺緭鍗忚
- info.setProtocol(item.getConf().getSourceprotocol());
+ info.setProtocol(conf.getSourceProtocol());
//鎷夋祦鏁伴噺
List<Readers> readers = item.getReaders();
info.setNum(readers.size());
@@ -329,8 +346,9 @@
//ID
String name = item.getName();
info.setName(name);
+ Conf conf = mediaClient.getPathInfo(name);
//浼犺緭鍗忚
- info.setProtocol(item.getConf().getSourceprotocol());
+ info.setProtocol(conf.getSourceProtocol());
String type = reader.getType();
switch (type) {
@@ -460,20 +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 (ForestRuntimeException ex) {
+ log.error("鑾峰彇娴佸獟浣搉ame鍒楄〃寮傚父锛�" + ex.getMessage());
}
- catch (Exception ex)
- {
- log.error(ex.getMessage());
- }
- return nameList;
+ return mediaNameList;
}
/**
@@ -484,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;
@@ -498,4 +514,6 @@
public String setConfig(Config config) {
return mediaClient.setConfig(config);
}
+
+
}
--
Gitblit v1.9.3