Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-10-17 1ab85e9fd1b392d36c6f2b08754249e4574ea4e8

 ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdArdMediaServiceImpl.java

@@ -63,11 +63,11 @@
            conf.setMaxReaders(100);
            conf.setSourceProtocol("tcp");

            if (!checkNameExist(ardVtdu.getName())) {
                mediaClient.addPath(ardVtdu.getName(), conf);
            } else {
                mediaClient.editPath(ardVtdu.getName(), conf);
            if (checkNameExist(ardVtdu.getName())) {
                mediaClient.removePath(ardVtdu.getName());
            }
            mediaClient.addPath(ardVtdu.getName(), conf);

            ardVtdu.setCameraId(ardVtdu.getName().split("_")[0]);
            ardVtdu.setRtspUrl(rtspUrl);
            ardVtdu.setRtmpUrl(rtmpUrl);
@@ -393,7 +393,7 @@
                nameList.add(item.getName());
            }
        } catch (Exception ex) {
            log.error("获取流媒体name列表异常：" + ex.getMessage());
            log.error("获取流媒体name列表异常：{}", ex.getMessage());
        }
        return nameList;
    }