guzijian / wvp-GB28181-pro · Commits

Commit c8f9f19c38832f030c5bde5c79ccd8485590d309

Authored by 648540858
1 parent 4a0fd9ea

#393

Inline Side-by-side
Showing 3 changed files with 3 additions and 2 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
  View file @c8f9f19
@@ -230,6 +230,7 @@ public class SIPRequestHeaderProvider { @@ -230,6 +230,7 @@ public class SIPRequestHeaderProvider {
230 Request request = null; 230 Request request = null;
231 if (streamInfo == null) return null; 231 if (streamInfo == null) return null;
232 Dialog dialog = streamSession.getDialogByStream(streamInfo.getDeviceID(), streamInfo.getChannelId(), streamInfo.getStream()); 232 Dialog dialog = streamSession.getDialogByStream(streamInfo.getDeviceID(), streamInfo.getChannelId(), streamInfo.getStream());
  233 + if (dialog == null) return null;
233 234
234 SipURI requestLine = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(), 235 SipURI requestLine = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(),
235 device.getHostAddress()); 236 device.getHostAddress());
src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
  View file @c8f9f19
@@ -33,7 +33,7 @@ public interface GbStreamMapper { @@ -33,7 +33,7 @@ public interface GbStreamMapper {
33 "mediaServerId=#{mediaServerId}," + 33 "mediaServerId=#{mediaServerId}," +
34 "status=${status} " + 34 "status=${status} " +
35 "WHERE app=#{app} AND stream=#{stream}") 35 "WHERE app=#{app} AND stream=#{stream}")
36 - int updateByallAndStream(GbStream gbStream); 36 + int updateByAppAndStream(GbStream gbStream);
37 37
38 @Update("UPDATE gb_stream " + 38 @Update("UPDATE gb_stream " +
39 "SET app=#{app}," + 39 "SET app=#{app}," +
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
  View file @c8f9f19
@@ -772,7 +772,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { @@ -772,7 +772,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
772 try { 772 try {
773 if (streamProxyMapper.update(streamProxyItem) > 0) { 773 if (streamProxyMapper.update(streamProxyItem) > 0) {
774 if (!StringUtils.isEmpty(streamProxyItem.getGbId())) { 774 if (!StringUtils.isEmpty(streamProxyItem.getGbId())) {
775 - if (gbStreamMapper.updateByallAndStream(streamProxyItem) > 0) { 775 + if (gbStreamMapper.updateByAppAndStream(streamProxyItem) == 0) {
776 //事务回滚 776 //事务回滚
777 dataSourceTransactionManager.rollback(transactionStatus); 777 dataSourceTransactionManager.rollback(transactionStatus);
778 return false; 778 return false;