Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/master' into dev/master-通道结构重构 

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
pull/1642/head
648540858 2024-07-22 14:29:54 +08:00
parent c96c29776d b7d671e6d9
commit ff5ba1698a
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
View File

@ -80,7 +80,9 @@ public class SipLayer implements CommandLineRunner {
monitorIps.add(sipConfig.getIp()); monitorIps.add(sipConfig.getIp());
} }
} }
sipConfig.setShowIp(String.join(",", monitorIps)); if (ObjectUtils.isEmpty(sipConfig.getShowIp())){
sipConfig.setShowIp(String.join(",", monitorIps));
}
SipFactory.getInstance().setPathName("gov.nist"); SipFactory.getInstance().setPathName("gov.nist");
if (monitorIps.size() > 0) { if (monitorIps.size() > 0) {
for (String monitorIp : monitorIps) { for (String monitorIp : monitorIps) {

6
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
View File

@ -1098,12 +1098,6 @@ public class PlayServiceImpl implements IPlayService {
log.warn("[获取下载进度] 查询录像信息时发现节点不存在"); log.warn("[获取下载进度] 查询录像信息时发现节点不存在");
return null; return null;
} }
SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(deviceId, channelId, null, stream);
if (ssrcTransaction == null) {
log.warn("[获取下载进度] 下载已结束");
return null;
}
String app = "rtp"; String app = "rtp";
Long duration = mediaServerService.updateDownloadProcess(mediaServerItem, app, stream); Long duration = mediaServerService.updateDownloadProcess(mediaServerItem, app, stream);
if (duration == null || duration == 0) { if (duration == null || duration == 0) {