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

Revert "修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题" 

This reverts commit 16e8aa323f.
pull/375/head
648540858 2022-03-04 15:36:16 +08:00
parent cadd0ee038
commit 50c2a5a728
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -314,7 +314,6 @@ public class PlayServiceImpl implements IPlayService {
}, event -> { }, event -> {
msg.setData(String.format("回放失败， 错误码： %s, %s", event.statusCode, event.msg)); msg.setData(String.format("回放失败， 错误码： %s, %s", event.statusCode, event.msg));
callback.call(msg); callback.call(msg);
streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
}); });
return result; return result;
} }

2
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
View File

@ -717,7 +717,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
try { try {
if (streamProxyMapper.add(streamProxyItem) > 0) { if (streamProxyMapper.add(streamProxyItem) > 0) {
if (!StringUtils.isEmpty(streamProxyItem.getGbId())) { if (!StringUtils.isEmpty(streamProxyItem.getGbId())) {
if (gbStreamMapper.add(streamProxyItem) <= 0) { if (gbStreamMapper.add(streamProxyItem) > 0) {
//事务回滚 //事务回滚
dataSourceTransactionManager.rollback(transactionStatus); dataSourceTransactionManager.rollback(transactionStatus);
return false; return false;