From 85f0196891cdf5bc2f80f384df47c7d27fc5d23a Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 09 八月 2023 15:10:52 +0800
Subject: [PATCH] 修改雷达报警聚合方式
---
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java | 67 ++++++++++++++++-----------------
1 files changed, 32 insertions(+), 35 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 31a8fe7..d10da3b 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,6 +6,7 @@
import com.ruoyi.media.service.IMediaService;
import com.ruoyi.utils.forest.MediaClient;
import com.ruoyi.utils.tools.ArdTool;
+import com.ruoyi.utils.tools.CmdUtils;
import com.sun.jna.Platform;
import io.minio.messages.Item;
import lombok.extern.slf4j.Slf4j;
@@ -14,6 +15,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
import javax.annotation.Resource;
import java.io.BufferedReader;
import java.io.File;
@@ -32,55 +34,50 @@
* @Version: 1.0
**/
@Service
-@Slf4j
+@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 (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);
+ 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);
+ }
}
}
- 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();
+
+ @PreDestroy
+ public void destroyMediaMtx() {
+ log.info("閿�姣乵ediaMtx");
+ if (CmdUtils.isProcessRunning(processName)) {
+ // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋�
+ CmdUtils.stopProcess(processName);
}
}
+
@Override
public String addPath(String name, String rtspPath, String mode) {
String rtspUrl = "rtsp://" + mediamtxHost + ":7554/";
--
Gitblit v1.9.3