From 63a661a78e1999423ea7d94277a645ed4b9e7e6d Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 25 八月 2023 15:22:23 +0800
Subject: [PATCH] 优化minio工具类和其他工具类位置 优化派警管理列表分页问题
---
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java | 212 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 137 insertions(+), 75 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 baa5569..578291c 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,33 +6,80 @@
import com.ruoyi.media.service.IMediaService;
import com.ruoyi.utils.forest.MediaClient;
import com.ruoyi.utils.tools.ArdTool;
-import io.minio.messages.Item;
+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.stereotype.Service;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
import javax.annotation.Resource;
+import java.io.File;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
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(topic = "cmd")
public class MediaService implements IMediaService {
@Resource
MediaClient mediaClient;
@Value("${mediamtx.host}")
String mediamtxHost;
+ @Value("${mediamtx.enabled}")
+ Boolean mediamtxEnabled;
+
+ String processName = "mediamtx.exe";
+
+ @PostConstruct
+ public void initMediaMtx() {
+ if (mediamtxEnabled) {
+ 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";
+
+ List<String> cmd = new ArrayList<>();
+ cmd.add(exePath);
+ cmd.add(ymlPath);
+ if (CmdUtils.isProcessRunning(processName)) {
+ // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋�
+ CmdUtils.stopProcess(processName);
+ }
+ // 鍚姩鍚庡彴杩涚▼
+ CmdUtils.commandStart(processName, cmd, null);
+ // 鍚姩cmd绐楀彛
+// String[] command = {"cmd","/c","start",exePath,ymlPath};
+// CmdUtils.commandStart(command);
+ }
+ }
+ }
+
+ @PreDestroy
+ public void destroyMediaMtx() {
+ if (mediamtxEnabled) {
+ log.info("閿�姣乵ediaMtx");
+ if (CmdUtils.isProcessRunning(processName)) {
+ // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋�
+ CmdUtils.stopProcess(processName);
+ }
+ }
+ }
+
@Override
- public String addPath(String name, String rtspPath,String mode) {
- String rtspUrl = "rtsp://" + mediamtxHost + ":8554/";
+ public String addPath(String name, String rtspPath, String mode, String isCode) {
+ String rtspUrl = "rtsp://" + mediamtxHost + ":7554/" + name;
Conf mediaInfo = new Conf();
//-vcodec libx264 //鎸囧畾瑙嗛缂栫爜鍣ㄤ负 libx264锛屼娇鐢� H.264 缂栫爜鏍煎紡杩涜瑙嗛鍘嬬缉
//-preset ultrafast //--preset鐨勫弬鏁颁富瑕佽皟鑺傜紪鐮侀�熷害鍜岃川閲忕殑骞宠 锛屾湁ultrafast锛堣浆鐮侀�熷害鏈�蹇紝瑙嗛寰�寰�涔熸渶妯＄硦锛夈�乻uperfast銆乿eryfast銆乫aster銆乫ast銆乵edium銆乻low銆乻lower銆乿eryslow銆乸lacebo杩�10涓�夐」锛屼粠蹇埌鎱�
@@ -45,18 +92,20 @@
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";
-
- if(mode.equals("1"))
- {
- mediaInfo.setRunondemand(cmd);
- mediaInfo.setRunondemandrestart(true);
+ if (isCode.equals("1")) {
+ if (mode.equals("1")) {
+ mediaInfo.setRunondemand(cmd);
+ mediaInfo.setRunondemandrestart(true);
+ } else {
+ mediaInfo.setRunoninit(cmd);
+ mediaInfo.setRunoninitrestart(true);
+ }
+ } else {
+ mediaInfo.setSource(rtspPath);
}
- else{
- mediaInfo.setRunoninit(cmd);
- mediaInfo.setRunoninitrestart(true);
- }
+ mediaInfo.setSourceprotocol("udp");
mediaClient.addPath(name, mediaInfo);
- return rtspUrl + name;
+ return rtspUrl;
}
@Override
@@ -67,13 +116,10 @@
info.setName(name);
String runoninit;
String runondemand = item.getConf().getRunondemand();
- if (StringUtils.isNotEmpty(runondemand))
- {
- runoninit= item.getConf().getRunondemand();
+ if (StringUtils.isNotEmpty(runondemand)) {
+ runoninit = item.getConf().getRunondemand();
info.setMode("1");
- }
- else
- {
+ } else {
runoninit = item.getConf().getRunoninit();
info.setMode("2");
}
@@ -83,21 +129,25 @@
Matcher matcher = pattern.matcher(runoninit);
if (matcher.find()) {
info.setRtspSource(matcher.group());
+ info.setIsCode("1");
+ }
+ else
+ {
+ info.setRtspSource(item.getConf().getSource());
+ info.setIsCode("0");
}
return info;
}
@Override
public void removePath(String[] names) {
- for(String name:names)
- {
+ for (String name : names) {
mediaClient.removePath(name);
}
}
@Override
public List<StreamInfo> paths() {
-
String list = mediaClient.paths();
JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
List<Items> items = jsonsRoot.getItems();
@@ -109,13 +159,10 @@
info.setName(name);
String runoninit;
String runondemand = item.getConf().getRunondemand();
- if (StringUtils.isNotEmpty(runondemand))
- {
- runoninit= item.getConf().getRunondemand();
+ if (StringUtils.isNotEmpty(runondemand)) {
+ runoninit = item.getConf().getRunondemand();
info.setMode("1");
- }
- else
- {
+ } else {
runoninit = item.getConf().getRunoninit();
info.setMode("2");
}
@@ -125,6 +172,10 @@
Matcher matcher = pattern.matcher(runoninit);
if (matcher.find()) {
info.setRtspSource(matcher.group());
+ info.setIsCode("1");
+ } else {
+ info.setRtspSource(item.getConf().getSource());
+ info.setIsCode("0");
}
//浼犺緭鍗忚
regex = "-rtsp_transport\\s+(\\w+)";
@@ -205,36 +256,40 @@
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)
- {
- continue;
+ if (source==null||source.getId().equals("")) {
+ //浼氳瘽ID
+ info.setId("0");
+ //涓婅娴侀噺
+ long bytesReceived = item.getBytesReceived();
+ String formatReceivedSize = ArdTool.formatFileSize(bytesReceived);
+ info.setUpTraffic(formatReceivedSize);
+ } else {
+ RtspSession rtspSession = getRtspSessionById(source.getId());
+ //浼氳瘽ID
+ info.setId(rtspSession.getId());
+ //寮�濮嬫帹娴佹椂闂�
+ info.setBeginTime(rtspSession.getCreated());
+ //涓婅娴侀噺
+ long bytesReceived = rtspSession.getBytesReceived();
+ String formatReceivedSize = ArdTool.formatFileSize(bytesReceived);
+ info.setUpTraffic(formatReceivedSize);
+ //涓嬭娴侀噺
+ long bytesSent = rtspSession.getBytesSent();
+ String formatSentSize = ArdTool.formatFileSize(bytesSent);
+ info.setDownTraffic(formatSentSize);
+ //鎺ㄦ祦鏈嶅姟鍣�
+ info.setRemoteAddr(rtspSession.getRemoteAddr());
}
- RtspSession rtspSession = getRtspSessionById(source.getId());
- //浼氳瘽ID
- info.setId(rtspSession.getId());
- //寮�濮嬫帹娴佹椂闂�
- info.setBeginTime(rtspSession.getCreated());
- //涓婅娴侀噺
- long bytesReceived = rtspSession.getBytesReceived();
- String formatReceivedSize = ArdTool.formatFileSize(bytesReceived);
- info.setUpTraffic(formatReceivedSize);
- //涓嬭娴侀噺
- long bytesSent = rtspSession.getBytesSent();
- String formatSentSize = ArdTool.formatFileSize(bytesSent);
- info.setDownTraffic(formatSentSize);
//RTSP婧愬湴鍧�
String runondemand = item.getConf().getRunondemand();
String runoninit;
- if(StringUtils.isNotEmpty(runondemand))
- {
- runoninit = item.getConf().getRunondemand();
- }
- else
- {
- runoninit = item.getConf().getRunoninit();
+ if (StringUtils.isNotEmpty(runondemand)) {
+ runoninit = item.getConf().getRunondemand();
+ } else {
+ runoninit = item.getConf().getRunoninit();
}
String regex = "rtsp://[^\\s\"]+";
Pattern pattern = Pattern.compile(regex);
@@ -242,18 +297,22 @@
if (matcher.find()) {
info.setRtspSource(matcher.group());
}
- //浼犺緭鍗忚
- regex = "-rtsp_transport\\s+(\\w+)";
- pattern = Pattern.compile(regex);
- matcher = pattern.matcher(runoninit);
- if (matcher.find()) {
- info.setProtocol(matcher.group(1));
+ else
+ {
+ info.setRtspSource(item.getConf().getSource());
}
+ //浼犺緭鍗忚
+// regex = "-rtsp_transport\\s+(\\w+)";
+// pattern = Pattern.compile(regex);
+// matcher = pattern.matcher(runoninit);
+// if (matcher.find()) {
+// info.setProtocol(matcher.group(1));
+// }
+ info.setProtocol(item.getConf().getSourceprotocol());
//鎷夋祦鏁伴噺
List<Readers> readers = item.getReaders();
info.setNum(readers.size());
- //鎺ㄦ祦鏈嶅姟鍣�
- info.setRemoteAddr(rtspSession.getRemoteAddr());
+
PushStreamInfoList.add(info);
}
@@ -267,15 +326,15 @@
JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
List<Items> items = jsonsRoot.getItems();
for (Items item : items) {
- StreamInfo info = new StreamInfo();
- //ID
- String name = item.getName();
- info.setName(name);
- //RTSP鎾斁鍦板潃
- String rtspUrl = "rtsp://" + mediamtxHost + ":8554/" + name;
- info.setRtspUrl(rtspUrl);
List<Readers> readers = item.getReaders();
for (Readers reader : readers) {
+ StreamInfo info = new StreamInfo();
+ //ID
+ String name = item.getName();
+ info.setName(name);
+ //RTSP鎾斁鍦板潃
+ String rtspUrl = "rtsp://" + mediamtxHost + ":8554/" + name;
+ info.setRtspUrl(rtspUrl);
RtspSession rtspSession = getRtspSessionById(reader.getId());
//浼氳瘽ID
info.setId(rtspSession.getId());
@@ -291,18 +350,21 @@
info.setDownTraffic(formatSentSize);
//浼犺緭鍗忚
- String runoninit = item.getConf().getRunondemand();
- String regex = "-rtsp_transport\\s+(\\w+)";
- Pattern pattern = Pattern.compile(regex);
- Matcher matcher = pattern.matcher(runoninit);
- if (matcher.find()) {
- info.setProtocol(matcher.group(1));
- }
+// String runoninit = item.getConf().getRunondemand();
+// String regex = "-rtsp_transport\\s+(\\w+)";
+// Pattern pattern = Pattern.compile(regex);
+// Matcher matcher = pattern.matcher(runoninit);
+// if (matcher.find()) {
+// info.setProtocol(matcher.group(1));
+// }
+ info.setProtocol(item.getConf().getSourceprotocol());
//鎷夋祦鏈嶅姟鍣�
info.setRemoteAddr(rtspSession.getRemoteAddr());
PullStreamInfoList.add(info);
}
}
+ Comparator<StreamInfo> comparator = Comparator.comparing(streamInfo ->streamInfo.getBeginTime() ); // 浣跨敤Collections.sort鏂规硶杩涜鎺掑簭 Collections.sort(personList, comparator);
+ Collections.sort(PullStreamInfoList, comparator.reversed());
return PullStreamInfoList;
}
--
Gitblit v1.9.3