From 84ffb112e0f8fed4003a4fdd46afb257a87c9e34 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 27 Nov 2025 13:27:17 +0800
Subject: [PATCH] Merge branch 'dev' of http://59.110.226.79:18000/r/uav/ard-uav-server into dev
---
ard-device/src/main/java/com/ard/device/channel/service/impl/ArdChannelServiceImpl.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/ard-device/src/main/java/com/ard/device/channel/service/impl/ArdChannelServiceImpl.java b/ard-device/src/main/java/com/ard/device/channel/service/impl/ArdChannelServiceImpl.java
index bebd3a1..2c9f997 100644
--- a/ard-device/src/main/java/com/ard/device/channel/service/impl/ArdChannelServiceImpl.java
+++ b/ard-device/src/main/java/com/ard/device/channel/service/impl/ArdChannelServiceImpl.java
@@ -13,6 +13,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@@ -34,6 +35,7 @@
private IArdVtduService ardVtduService;
@Resource
private MediamtxConfig mediamtxConfig;
+
/**
* 查询通道管理
*
@@ -105,12 +107,13 @@
* 清空通道
*
* @author 刘苏义
- * @date 2024/8/10 11:18
+ * @date 2024/8/10 11:18
*/
@Override
- public int clearArdChannel(){
+ public int clearArdChannel() {
return ardChannelMapper.clearArdChannel();
}
+
/**
* 删除通道管理信息
*
@@ -121,6 +124,7 @@
public int deleteArdChannelByDeviceId(String deviceId) {
return ardChannelMapper.deleteArdChannelByDeviceId(deviceId);
}
+
/**
* 校验相机通道是否唯一
*
@@ -130,8 +134,7 @@
@Override
public boolean checkArdChannelUnique(ArdChannel channel) {
ArdChannel info = ardChannelMapper.checkArdChannelUnique(channel);
- if (info != null && !Objects.equals(info.getId(), channel.getId()))
- {
+ if (info != null && !Objects.equals(info.getId(), channel.getId())) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -143,7 +146,7 @@
log.debug("定时同步Vtdu任务");
List<ArdChannel> channels = this.selectArdChannelList(new ArdChannel());
if (channels == null || channels.isEmpty()) {
- log.warn("没有获取到通道数据，退出同步");
+ // log.warn("没有获取到通道数据，退出同步");
return;
}
List<ArdVtdu> ardVtduList = ardVtduService.selectArdVtduList(new ArdVtdu());
@@ -156,10 +159,16 @@
String name = channel.getDeviceId() + "_" + channel.getChanNo(); // 生成媒体表的 name
String cameraId = channel.getDeviceId(); // cameraId 就是通道的 deviceId
String rtspSourceUrl = getRtspSource(channel);
- String rtspUrl = "rtsp://" + mediamtxConfig.getPlayHost() + ":8554" + "/" + name; // 拼接 webrtcUrl
- String rtmpUrl = "rtmp://" + mediamtxConfig.getPlayHost() + ":1935" + "/" + name; // 拼接 webrtcUrl
+ String rtspUrl =
+ "rtsp://" + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getRtspPort() + "/" + name; //
+ // 拼接 webrtcUrl
+ String rtmpUrl =
+ "rtmp://" + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getRtmpPort() + "/" + name; // 拼接
+ // webrtcUrl
String protocol = mediamtxConfig.isHttps() ? "https://" : "http://";
- String webrtcUrl = protocol + mediamtxConfig.getPlayHost() + ":8889" + "/" + name; // 拼接 webrtcUrl
+ String webrtcUrl =
+ protocol + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getWebrtcPort() + "/" + name;
+ // 拼接 webrtcUrl
// 先检查媒体表是否已有此记录
Optional<ArdVtdu> existingMedia = ardVtduList.stream()
@@ -196,6 +205,7 @@
// 3. 删除操作：删除媒体表中多余的记录
List<String> invalidNames = ardVtduList.stream()
.filter(vtdu -> !validNames.contains(vtdu.getName()))
+ .filter(vtdu -> !"publisher".equalsIgnoreCase(vtdu.getRtspSource())) // 不是机场流
.map(ArdVtdu::getName)
.collect(Collectors.toList());
@@ -211,7 +221,7 @@
// 根据通道信息获取rtsp源地址
private String getRtspSource(ArdChannel channel) {
String rtspSource = "";
- ArdCamera ardCamera =ardCameraService.selectArdCameraById(channel.getDeviceId());
+ ArdCamera ardCamera = ardCameraService.selectArdCameraById(channel.getDeviceId());
if (ardCamera != null) {
switch (ardCamera.getFactory()) {
case "1":
--
Gitblit v1.9.3