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

临时提交

pull/1642/head
panlinlin 2024-06-29 12:01:42 +08:00
parent 97bc8766bc
commit 69e7ab5439
1 changed files with 1 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyServiceImpl.java
View File

@ -225,68 +225,6 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
return true; return true;
} }
@Override
public WVPResult<String> addStreamProxyToZlm(StreamProxy param) {
WVPResult<String> result = null;
MediaServer mediaServer = null;
if (param.getMediaServerId() == null) {
log.warn("添加代理时MediaServerId 为null");
return null;
}else {
mediaServer = mediaServerService.getOne(param.getMediaServerId());
}
if (mediaServer == null) {
return null;
}
if (mediaServerService.isStreamReady(mediaServer, param.getApp(), param.getStream())) {
mediaServerService.closeStreams(mediaServer, param.getApp(), param.getStream());
}
String msgResult;
if ("ffmpeg".equalsIgnoreCase(param.getType())){
if (param.getTimeoutMs() == 0) {
param.setTimeoutMs(15);
}
result = mediaServerService.addFFmpegSource(mediaServer, param.getSrcUrl().trim(), param.getDstUrl(),
param.getTimeoutMs(), param.isEnableAudio(), param.isEnableMp4(),
param.getFfmpegCmdKey());
}else {
result = mediaServerService.addStreamProxy(mediaServer, param.getApp(), param.getStream(), param.getSrcUrl().trim(),
param.isEnableAudio(), param.isEnableMp4(), param.getRtspType(), param.getTimeout());
}
if (result != null && result.getCode() == 0) {
String key = result.getData();
if (key == null) {
log.warn("[获取拉流代理的结果数据Data] 失败： {}", result );
return result;
}
param.setStreamKey(key);
streamProxyMapper.update(param);
}
return result;
}
@Override
public Boolean removeStreamProxyFromZlm(StreamProxy param) {
if (param ==null) {
return null;
}
MediaServer mediaServer = mediaServerService.getOne(param.getMediaServerId());
if (mediaServer == null) {
return null;
}
List<StreamInfo> mediaList = mediaServerService.getMediaList(mediaServer, param.getApp(), param.getStream(), null);
if (mediaList == null || mediaList.isEmpty()) {
return true;
}
Boolean result = false;
if ("ffmpeg".equalsIgnoreCase(param.getType())){
result = mediaServerService.delFFmpegSource(mediaServer, param.getStreamKey());
}else {
result = mediaServerService.delStreamProxy(mediaServer, param.getStreamKey());
}
return result;
}
@Override @Override
public PageInfo<StreamProxy> getAll(Integer page, Integer count) { public PageInfo<StreamProxy> getAll(Integer page, Integer count) {
PageHelper.startPage(page, count); PageHelper.startPage(page, count);
@ -380,6 +318,7 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
mediaServerId, true); mediaServerId, true);
for (StreamProxy streamProxyDto : streamProxyListForEnable) { for (StreamProxy streamProxyDto : streamProxyListForEnable) {
log.info("恢复流代理，" + streamProxyDto.getApp() + "/" + streamProxyDto.getStream()); log.info("恢复流代理，" + streamProxyDto.getApp() + "/" + streamProxyDto.getStream());
mediaServerService.startProxy(me)
WVPResult<String> wvpResult = addStreamProxyToZlm(streamProxyDto); WVPResult<String> wvpResult = addStreamProxyToZlm(streamProxyDto);
if (wvpResult == null) { if (wvpResult == null) {
// 设置为离线 // 设置为离线