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

zhaowenyu

2025-12-02 04c90bec00f91e8c403d7acaa338f69e5029617a

 ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java

@@ -158,9 +158,13 @@
                    }
                }
                else{
                    live.setRtmpUrl(rtmpUrl);
                    live.setRtspUrl(rtspUrl);
                    live.setWebrtcUrl(webrtcUrl);
                    i = ardVtduService.updateArdVtdu(vtdu);
                    log.info("机场视频更新后 i:{}",i);
                    if (i > 0) {
                        live.setRtmpUrl(rtmpUrl);
                        live.setRtspUrl(rtspUrl);
                        live.setWebrtcUrl(webrtcUrl);
                    }
                }
                //int i = ardVtduService.insertArdVtdu(vtdu);  // 保存到媒体表
//                if (i > 0) {