From 7e28149acdcf0c7dd59171c0ec63807759c86c00 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 05 九月 2023 10:41:35 +0800
Subject: [PATCH] 电子围栏报警区分禁入禁出 电子围栏报警查看标记增加毫秒 初始化程序增加启动顺序
---
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 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 c7cdcc4..bd0b588 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
@@ -11,6 +11,9 @@
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.stereotype.Service;
import javax.annotation.PostConstruct;
@@ -33,7 +36,8 @@
**/
@Service
@Slf4j(topic = "cmd")
-public class MediaServiceImpl implements IMediaService {
+@Order(1)
+public class MediaServiceImpl implements IMediaService, ApplicationRunner {
@Resource
VtduMapper vtduMapper;
@Resource
@@ -47,12 +51,24 @@
String processName = "mediamtx.exe";
- static{
+ @Override
+ public void run(ApplicationArguments args) throws Exception {
+ log.info("寮�濮嬪姞杞芥祦濯掍綋鍒楄〃");
+ List<StreamInfo> paths = paths();
+ for(StreamInfo path:paths)
+ {
+ mediaClient.removePath(path.getName());
+ }
+ List<Vtdu> vtduList = vtduMapper.selectVtduList(new Vtdu());
+ for (Vtdu v : vtduList) {
+ addPath(v.getName(), v.getRtspUrl(), v.getCodeType(), v.getIsCode());
+ }
}
@PostConstruct
public void initMediaMtx() {
if (mediamtxEnabled) {
+ log.info("鍒濆鍖栧惎鍔╩ediaMTX");
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";
@@ -70,20 +86,6 @@
// String[] command = {"cmd","/c","start",exePath,ymlPath};
// CmdUtils.commandStart(command);
}
- }
- try {
- Thread.sleep(2000); // 绛夊緟5绉�
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- List<StreamInfo> paths = paths();
- for(StreamInfo path:paths)
- {
- mediaClient.removePath(path.getName());
- }
- List<Vtdu> vtduList = vtduMapper.selectVtduList(new Vtdu());
- for (Vtdu v : vtduList) {
- addPath(v.getName(), v.getRtspUrl(), v.getCodeType(), v.getIsCode());
}
}
@@ -456,4 +458,5 @@
return false;
}
}
+
}
--
Gitblit v1.9.3