From 2d68f48eeb8f874240f7b02ff20dbf1e784271b4 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 29 七月 2023 08:28:38 +0800
Subject: [PATCH] 单兵端-新任务轮询接口-更新弹窗标记/统计弹窗未查看数量
---
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java | 161 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 117 insertions(+), 44 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java
index cf7469e..31a8fe7 100644
--- a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java
+++ b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java
@@ -6,36 +6,84 @@
import com.ruoyi.media.service.IMediaService;
import com.ruoyi.utils.forest.MediaClient;
import com.ruoyi.utils.tools.ArdTool;
+import com.sun.jna.Platform;
import io.minio.messages.Item;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
+import javax.annotation.PostConstruct;
import javax.annotation.Resource;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * @Description:
+ * @Description: 娴佸獟浣撲笟鍔�
* @ClassName: MediaService
* @Author: 鍒樿嫃涔�
* @Date: 2023骞�07鏈�13鏃�9:28
* @Version: 1.0
**/
@Service
+@Slf4j
public class MediaService implements IMediaService {
@Resource
MediaClient mediaClient;
-
@Value("${mediamtx.host}")
String mediamtxHost;
+ @PostConstruct
+ public void initMediaMtx() {
+ if (Platform.isWindows()) {
+ String exePath = System.getProperty("user.dir") + File.separator + "lib" + File.separator + "mediamtx" + File.separator + "mediamtx.exe";
+ String ymlPath = System.getProperty("user.dir") + File.separator + "lib" + File.separator + "mediamtx" + File.separator + "mediamtx.yml";
+ // 鏋勫缓鍚姩鍛戒护锛屼娇鐢╟md /c start鍛戒护鏉ュ惎鍔ㄥ彲鎵ц绋嬪簭骞舵樉绀哄懡浠ゆ彁绀虹绐楀彛
+// String[] cmd = {"cmd", "/c", "start", exePath,ymlPath};
+// ProcessBuilder processBuilder = new ProcessBuilder(cmd);
+// processBuilder.redirectErrorStream(true); // 灏嗛敊璇緭鍑洪噸瀹氬悜鍒版爣鍑嗚緭鍑�
+// Process process = processBuilder.start();
+ // 濡傛灉浣犳兂绛夊緟绋嬪簭瀹屾垚
+ // int exitCode = process.waitFor();
+ List<String> cmd = new ArrayList<>();
+ cmd.add(exePath);
+ cmd.add(ymlPath);
+ commandStart(cmd);
+
+ }
+ }
+ public static void commandStart(List<String> command) {
+ command.forEach(v -> System.out.print(v + " "));
+ System.out.println();
+ System.out.println();
+ ProcessBuilder builder = new ProcessBuilder();
+ //姝ｅ父淇℃伅鍜岄敊璇俊鎭悎骞惰緭鍑�
+ builder.redirectErrorStream(true);
+ builder.command(command);
+ //寮�濮嬫墽琛屽懡浠�
+ Process process = null;
+ try {
+ process = builder.start();
+ //濡傛灉浣犳兂鑾峰彇鍒版墽琛屽畬鍚庣殑淇℃伅锛岄偅涔堜笅闈㈢殑浠ｇ爜涔熸槸闇�瑕佺殑
+// String line = "";
+// BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream()));
+// while ((line = br.readLine()) != null) {
+// System.out.println(line);
+// }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
@Override
- public String addPath(String name, String rtspPath) {
- String apiUrl = "http://" + mediamtxHost + ":9997/v2";
- String rtspUrl = "rtsp://" + mediamtxHost + ":8554/";
+ public String addPath(String name, String rtspPath, String mode) {
+ String rtspUrl = "rtsp://" + mediamtxHost + ":7554/";
Conf mediaInfo = new Conf();
//-vcodec libx264 //鎸囧畾瑙嗛缂栫爜鍣ㄤ负 libx264锛屼娇鐢� H.264 缂栫爜鏍煎紡杩涜瑙嗛鍘嬬缉
//-preset ultrafast //--preset鐨勫弬鏁颁富瑕佽皟鑺傜紪鐮侀�熷害鍜岃川閲忕殑骞宠 锛屾湁ultrafast锛堣浆鐮侀�熷害鏈�蹇紝瑙嗛寰�寰�涔熸渶妯＄硦锛夈�乻uperfast銆乿eryfast銆乫aster銆乫ast銆乵edium銆乻low銆乻lower銆乿eryslow銆乸lacebo杩�10涓�夐」锛屼粠蹇埌鎱�
@@ -48,24 +96,54 @@
String cmd = "ffmpeg -rtsp_transport tcp -i \"" + rtspPath + "\" -vcodec libx264 -preset:v ultrafast -r 25 -threads 4 -b:v 4096k -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
//GPU纭В鐮佺紪鐮� -hwaccel cuvid -c:v h264_cuvid 浣跨敤cuda瑙ｇ爜 -c:v h264_nvenc 浣跨敤cuda缂栫爜
//String cmd = "ffmpeg -hwaccel cuvid -c:v h264_cuvid -rtsp_transport udp -i \"" + rtspPath + "\" -c:v h264_nvenc -r 25 -threads 4 -b:v 4096k -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
-// mediaInfo.setRunoninit(cmd);
-// mediaInfo.setRunoninitrestart(true);
- mediaInfo.setRunondemand(cmd);
- mediaInfo.setRunondemandrestart(true);
- mediaClient.addPath(apiUrl, name, mediaInfo);
+
+ if (mode.equals("1")) {
+ mediaInfo.setRunondemand(cmd);
+ mediaInfo.setRunondemandrestart(true);
+ } else {
+ mediaInfo.setRunoninit(cmd);
+ mediaInfo.setRunoninitrestart(true);
+ }
+ mediaClient.addPath(name, mediaInfo);
return rtspUrl + name;
}
@Override
- public void removePath(String name) {
- String apiUrl = "http://" + mediamtxHost + ":9997/v2";
- mediaClient.removePath(apiUrl, name);
+ public StreamInfo getPathInfo(String name) {
+ Items item = mediaClient.getPathInfo(name);
+ StreamInfo info = new StreamInfo();
+ //ID
+ info.setName(name);
+ String runoninit;
+ String runondemand = item.getConf().getRunondemand();
+ if (StringUtils.isNotEmpty(runondemand)) {
+ runoninit = item.getConf().getRunondemand();
+ info.setMode("1");
+ } else {
+ runoninit = item.getConf().getRunoninit();
+ info.setMode("2");
+ }
+ //RTSP婧愬湴鍧�
+ String regex = "rtsp://[^\\s\"]+";
+ Pattern pattern = Pattern.compile(regex);
+ Matcher matcher = pattern.matcher(runoninit);
+ if (matcher.find()) {
+ info.setRtspSource(matcher.group());
+ }
+ return info;
+ }
+
+ @Override
+ public void removePath(String[] names) {
+ for (String name : names) {
+ mediaClient.removePath(name);
+ }
}
@Override
public List<StreamInfo> paths() {
- String apiUrl = "http://" + mediamtxHost + ":9997/v2";
- String list = mediaClient.paths(apiUrl);
+
+ String list = mediaClient.paths();
JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
List<Items> items = jsonsRoot.getItems();
List<StreamInfo> pathInfoList = new ArrayList<>();
@@ -74,18 +152,16 @@
//ID
String name = item.getName();
info.setName(name);
- String runoninit="";
+ String runoninit;
String runondemand = item.getConf().getRunondemand();
- if (StringUtils.isNotEmpty(runondemand))
- {
- runoninit= item.getConf().getRunondemand();
- }
- else
- {
+ if (StringUtils.isNotEmpty(runondemand)) {
+ runoninit = item.getConf().getRunondemand();
+ info.setMode("1");
+ } else {
runoninit = item.getConf().getRunoninit();
+ info.setMode("2");
}
//RTSP婧愬湴鍧�
- runoninit = item.getConf().getRunondemand();
String regex = "rtsp://[^\\s\"]+";
Pattern pattern = Pattern.compile(regex);
Matcher matcher = pattern.matcher(runoninit);
@@ -107,24 +183,21 @@
@Override
public List<Items> rtspconns() {
- String apiUrl = "http://" + mediamtxHost + ":9997/v2";
- String list = mediaClient.rtspconns(apiUrl);
+ String list = mediaClient.rtspconns();
JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
return jsonsRoot.getItems();
}
@Override
public List<Items> rtspsessions() {
- String apiUrl = "http://" + mediamtxHost + ":9997/v2";
- String list = mediaClient.rtspsessions(apiUrl);
+ String list = mediaClient.rtspsessions();
JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
return jsonsRoot.getItems();
}
@Override
public RtspSession getRtspSessionById(String sessionId) {
- String apiUrl = "http://" + mediamtxHost + ":9997/v2";
- String list = mediaClient.getRtspsessionById(apiUrl, sessionId);
+ String list = mediaClient.getRtspsessionById(sessionId);
RtspSession rtspSession = JSONObject.parseObject(list, RtspSession.class);
return rtspSession;
}
@@ -132,8 +205,8 @@
@Override
public List<RtspSession> getPushStreams() {
List<RtspSession> rtspSessions = new ArrayList<>();
- String apiUrl = "http://" + mediamtxHost + ":9997/v2";
- String list = mediaClient.paths(apiUrl);
+
+ String list = mediaClient.paths();
JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
List<Items> items = jsonsRoot.getItems();
for (Items item : items) {
@@ -148,8 +221,7 @@
@Override
public List<RtspSession> getPullStreams() {
List<RtspSession> rtspSessions = new ArrayList<>();
- String apiUrl = "http://" + mediamtxHost + ":9997/v2";
- String list = mediaClient.paths(apiUrl);
+ String list = mediaClient.paths();
JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
List<Items> items = jsonsRoot.getItems();
for (Items item : items) {
@@ -166,8 +238,7 @@
@Override
public List<StreamInfo> getPushStreamList() {
List<StreamInfo> PushStreamInfoList = new ArrayList<>();
- String apiUrl = "http://" + mediamtxHost + ":9997/v2";
- String list = mediaClient.paths(apiUrl);
+ String list = mediaClient.paths();
JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
List<Items> items = jsonsRoot.getItems();
for (Items item : items) {
@@ -176,11 +247,10 @@
String name = item.getName();
info.setName(name);
//RTSP鎾斁鍦板潃
- String rtspUrl = "rtsp://" + mediamtxHost + ":8554/" + name;
+ String rtspUrl = "rtsp://" + mediamtxHost + ":7554/" + name;
info.setRtspUrl(rtspUrl);
Source source = item.getSource();
- if(source==null)
- {
+ if (source == null) {
continue;
}
RtspSession rtspSession = getRtspSessionById(source.getId());
@@ -197,8 +267,13 @@
String formatSentSize = ArdTool.formatFileSize(bytesSent);
info.setDownTraffic(formatSentSize);
//RTSP婧愬湴鍧�
- //String runoninit = item.getConf().getRunoninit();
- String runoninit = item.getConf().getRunondemand();
+ String runondemand = item.getConf().getRunondemand();
+ String runoninit;
+ if (StringUtils.isNotEmpty(runondemand)) {
+ runoninit = item.getConf().getRunondemand();
+ } else {
+ runoninit = item.getConf().getRunoninit();
+ }
String regex = "rtsp://[^\\s\"]+";
Pattern pattern = Pattern.compile(regex);
Matcher matcher = pattern.matcher(runoninit);
@@ -226,8 +301,7 @@
@Override
public List<StreamInfo> getPullStreamList() {
List<StreamInfo> PullStreamInfoList = new ArrayList<>();
- String apiUrl = "http://" + mediamtxHost + ":9997/v2";
- String list = mediaClient.paths(apiUrl);
+ String list = mediaClient.paths();
JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
List<Items> items = jsonsRoot.getItems();
for (Items item : items) {
@@ -273,8 +347,7 @@
@Override
public Boolean kickRtspSession(String sessionId) {
try {
- String apiUrl = "http://" + mediamtxHost + ":9997/v2";
- mediaClient.kick(apiUrl, sessionId);
+ mediaClient.kick(sessionId);
return true;
} catch (Exception ex) {
return false;
--
Gitblit v1.9.3