From 16fd4235f692777cfd9cceff5090e5450e2173b3 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Tue, 04 Mar 2025 13:59:05 +0800
Subject: [PATCH] 优化包结构、增加载荷飞控权限
---
ard-work/src/main/java/com/ard/vtdu/service/impl/MediaServiceImpl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/vtdu/service/impl/MediaServiceImpl.java b/ard-work/src/main/java/com/ard/vtdu/service/impl/MediaServiceImpl.java
index e7bf0e3..b566e61 100644
--- a/ard-work/src/main/java/com/ard/vtdu/service/impl/MediaServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/vtdu/service/impl/MediaServiceImpl.java
@@ -2,8 +2,10 @@
import com.ard.common.constant.HttpStatus;
import com.ard.common.core.page.TableDataInfo;
-import com.ard.tianyu.model.receiver.BoxReceiver;
-import com.ard.tianyu.model.receiver.PullStreamUrlReceiver;
+import com.ard.tianyu.config.TyConfiguration;
+import com.ard.tianyu.domain.cache.TyTcpServerCache;
+import com.ard.tianyu.domain.receiver.BoxInfoReceiver;
+import com.ard.tianyu.domain.receiver.BoxStreamUrlReceiver;
import com.ard.tianyu.service.ITyService;
import com.ard.vtdu.client.MediaClient;
import com.ard.vtdu.domain.*;
@@ -13,7 +15,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
@@ -42,6 +43,8 @@
private MediaClient mediaClient;
@Resource
private ITyService tyService;
+ @Resource
+ private TyConfiguration tyConfiguration;
@Value("${mediamtx.host}")
private String mediamtxHost;
@@ -565,19 +568,22 @@
return mediaClient.getPathConfigs(pageNum - 1, pageSize);
}
- //同步无人机推流到流媒体
- @Scheduled(cron = "0/20 * * * * ?")
+ //同步无人机推流到流媒体(流量的关系 不能持续拉流 关闭定时同步任务)
+ // @Scheduled(cron = "0/20 * * * * ?")
public void syncVtdu() {
+ if (!TyTcpServerCache.getTcpServerCache(tyConfiguration.getTcpserver() + ":" + tyConfiguration.getTcpport())) {
+ return;
+ }
log.info("定时同步MediaMTX任务开始");
List<String> nameList = getNameList();
- List<BoxReceiver> boxList = tyService.getBoxList();
+ List<BoxInfoReceiver> boxList = tyService.getBoxList();
if (boxList == null || boxList.isEmpty()) {
return;
}
List<ArdVtdu> ardVtduList = boxList.stream()
.filter(boxReceiver -> boxReceiver.getOnLine() != 0) // 过滤掉不在线的
.map(boxReceiver -> {
- PullStreamUrlReceiver boxLiveUrl = tyService.getBoxLiveUrl(boxReceiver.getBoxSn());
+ BoxStreamUrlReceiver boxLiveUrl = tyService.getBoxLiveUrl(boxReceiver.getBoxSn());
return ArdVtdu.builder().name(boxReceiver.getBoxSn()).rtspSource(boxLiveUrl.getRtmp()).build();
})
.collect(Collectors.toList());
--
Gitblit v1.9.3