648540858 před 3 roky
rodič
revize
c8f9f19c38

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

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

+ 1 - 1
src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java

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

+ 1 - 1
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java

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