From 1025124051633ed086e1a53d8a2f01a7e6f833d2 Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期四, 07 九月 2023 16:50:21 +0800 Subject: [PATCH] 设备健康接口 --- ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java | 42 +++++++++++++++++++++++++----------------- 1 files changed, 25 insertions(+), 17 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..e27adb7 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,11 +36,13 @@ **/ @Service @Slf4j(topic = "cmd") -public class MediaServiceImpl implements IMediaService { +@Order(2) +public class MediaServiceImpl implements IMediaService, ApplicationRunner { @Resource VtduMapper vtduMapper; @Resource MediaClient mediaClient; + @Value("${mediamtx.host}") String mediamtxHost; @Value("${mediamtx.enabled}") @@ -47,12 +52,28 @@ String processName = "mediamtx.exe"; - static{ - + @Override + public void run(ApplicationArguments args){ + try { + 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()); + } + } + catch (Exception ex) + { + log.error("鍔犺浇娴佸獟浣撳垪琛ㄥ紓甯�:"+ex.getMessage()); + } } @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 +91,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 +463,5 @@ return false; } } + } -- Gitblit v1.9.3