Commit 50c2a5a72810add4fb9d6000802dcf36399a3b68
1 parent
cadd0ee0
Revert "修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题"
This reverts commit 16e8aa32.
Showing
2 changed files
with
1 additions
and
2 deletions
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
| @@ -314,7 +314,6 @@ public class PlayServiceImpl implements IPlayService { | @@ -314,7 +314,6 @@ public class PlayServiceImpl implements IPlayService { | ||
| 314 | }, event -> { | 314 | }, event -> { |
| 315 | msg.setData(String.format("回放失败, 错误码: %s, %s", event.statusCode, event.msg)); | 315 | msg.setData(String.format("回放失败, 错误码: %s, %s", event.statusCode, event.msg)); |
| 316 | callback.call(msg); | 316 | callback.call(msg); |
| 317 | - streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream()); | ||
| 318 | }); | 317 | }); |
| 319 | return result; | 318 | return result; |
| 320 | } | 319 | } |
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
| @@ -717,7 +717,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { | @@ -717,7 +717,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { | ||
| 717 | try { | 717 | try { |
| 718 | if (streamProxyMapper.add(streamProxyItem) > 0) { | 718 | if (streamProxyMapper.add(streamProxyItem) > 0) { |
| 719 | if (!StringUtils.isEmpty(streamProxyItem.getGbId())) { | 719 | if (!StringUtils.isEmpty(streamProxyItem.getGbId())) { |
| 720 | - if (gbStreamMapper.add(streamProxyItem) <= 0) { | 720 | + if (gbStreamMapper.add(streamProxyItem) > 0) { |
| 721 | //事务回滚 | 721 | //事务回滚 |
| 722 | dataSourceTransactionManager.rollback(transactionStatus); | 722 | dataSourceTransactionManager.rollback(transactionStatus); |
| 723 | return false; | 723 | return false; |