Browse Source

#393

pull/403/head
648540858 3 years ago
parent
commit
c8f9f19c38
  1. 1
      src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
  2. 2
      src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
  3. 2
      src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java

1
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java

@ -230,6 +230,7 @@ public class SIPRequestHeaderProvider {
Request request = null; Request request = null;
if (streamInfo == null) return null; if (streamInfo == null) return null;
Dialog dialog = streamSession.getDialogByStream(streamInfo.getDeviceID(), streamInfo.getChannelId(), streamInfo.getStream()); Dialog dialog = streamSession.getDialogByStream(streamInfo.getDeviceID(), streamInfo.getChannelId(), streamInfo.getStream());
if (dialog == null) return null;
SipURI requestLine = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(), SipURI requestLine = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(),
device.getHostAddress()); device.getHostAddress());

2
src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java

@ -33,7 +33,7 @@ public interface GbStreamMapper {
"mediaServerId=#{mediaServerId}," + "mediaServerId=#{mediaServerId}," +
"status=${status} " + "status=${status} " +
"WHERE app=#{app} AND stream=#{stream}") "WHERE app=#{app} AND stream=#{stream}")
int updateByallAndStream(GbStream gbStream); int updateByAppAndStream(GbStream gbStream);
@Update("UPDATE gb_stream " + @Update("UPDATE gb_stream " +
"SET app=#{app}," + "SET app=#{app}," +

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

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

Loading…
Cancel
Save