From dff994a28ff9be38450bc4e7ba540c2831d1206f Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 21 七月 2023 09:53:55 +0800
Subject: [PATCH] 上传车辆图片id设为非必要提交
---
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java | 140 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 106 insertions(+), 34 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 bf043d6..baa5569 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
@@ -1,10 +1,12 @@
package com.ruoyi.media.service.impl;
import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.media.domain.*;
import com.ruoyi.media.service.IMediaService;
import com.ruoyi.utils.forest.MediaClient;
import com.ruoyi.utils.tools.ArdTool;
+import io.minio.messages.Item;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -26,13 +28,10 @@
@Resource
MediaClient mediaClient;
-
@Value("${mediamtx.host}")
String mediamtxHost;
-
@Override
- public String addPath(String name, String rtspPath) {
- String apiUrl = "http://" + mediamtxHost + ":9997/v2";
+ public String addPath(String name, String rtspPath,String mode) {
String rtspUrl = "rtsp://" + mediamtxHost + ":8554/";
Conf mediaInfo = new Conf();
//-vcodec libx264 //鎸囧畾瑙嗛缂栫爜鍣ㄤ负 libx264锛屼娇鐢� H.264 缂栫爜鏍煎紡杩涜瑙嗛鍘嬬缉
@@ -46,48 +45,117 @@
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 List<Items> paths() {
- String apiUrl = "http://" + mediamtxHost + ":9997/v2";
- String list = mediaClient.paths(apiUrl);
+ public void removePath(String[] names) {
+ for(String name:names)
+ {
+ mediaClient.removePath(name);
+ }
+ }
+
+ @Override
+ public List<StreamInfo> paths() {
+
+ String list = mediaClient.paths();
JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
- return jsonsRoot.getItems();
+ List<Items> items = jsonsRoot.getItems();
+ List<StreamInfo> pathInfoList = new ArrayList<>();
+ for (Items item : items) {
+ StreamInfo info = new StreamInfo();
+ //ID
+ String name = item.getName();
+ 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());
+ }
+ //浼犺緭鍗忚
+ regex = "-rtsp_transport\\s+(\\w+)";
+ pattern = Pattern.compile(regex);
+ matcher = pattern.matcher(runoninit);
+ if (matcher.find()) {
+ info.setProtocol(matcher.group(1));
+ }
+
+ pathInfoList.add(info);
+ }
+ return pathInfoList;
}
@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;
}
@@ -95,8 +163,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) {
@@ -111,8 +179,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) {
@@ -129,8 +196,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) {
@@ -160,8 +226,16 @@
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);
@@ -189,8 +263,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) {
@@ -236,8 +309,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