From 8fe9faddf234f7087a516d7e1e068b558289e605 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 10 Feb 2026 14:54:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-device/src/main/java/com/ard/device/channel/service/impl/ArdChannelServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 bfae263..f5671f0 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
@@ -39,6 +39,7 @@
private IArdVtduService ardVtduService;
@Resource
private MediamtxConfig mediamtxConfig;
+
/**
* 查询通道管理
*
@@ -154,10 +155,10 @@
ArdChannel ardChannel = new ArdChannel();
ardChannel.setUseDataScope(false);
List<ArdChannel> channels = this.selectArdChannelList(ardChannel);
- if (channels == null || channels.isEmpty()) {
- // log.warn("没有获取到通道数据，退出同步");
- return;
- }
+// if (channels == null || channels.isEmpty()) {
+// // log.warn("没有获取到通道数据，退出同步");
+// return;
+// }
List<ArdVtdu> ardVtduList = ardVtduService.selectArdVtduList(new ArdVtdu());
Set<String> validNames = channels.stream()
@@ -172,7 +173,8 @@
"rtsp://" + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getRtspPort() + "/" + name; //
// 拼接 webrtcUrl
String rtmpUrl =
- "rtmp://" + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getRtmpPort() + "/" + name; // 拼接
+ "rtmp://" + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getRtmpPort() + "/" + name;
+ // 拼接
// webrtcUrl
String protocol = mediamtxConfig.isHttps() ? "https://" : "http://";
String webrtcUrl =
@@ -225,7 +227,7 @@
log.info("删除不再存在的媒体记录：{}", Arrays.toString(namesArray));
}
} catch (Exception e) {
- log.error("定时同步Vtdu任务异常:{}", e.getMessage());
+ log.error("定时同步Vtdu任务异常:{}", e.getMessage());
}
}
@@ -233,7 +235,7 @@
// 根据通道信息获取rtsp源地址
private String getRtspSource(ArdChannel channel) {
String rtspSource = "";
- ArdCamera ardCamera = redisCache.getCacheObject(CacheConstants.CAMERA_LIST_KEY + channel.getDeviceId());
+ ArdCamera ardCamera = redisCache.getCacheMapValue(CacheConstants.CAMERA_LIST, channel.getDeviceId());
if (ardCamera != null) {
switch (ardCamera.getFactory()) {
case "1":
--
Gitblit v1.9.3