From 35e222482b26d5e672eb5939a24458fc30a7d37f Mon Sep 17 00:00:00 2001 From: chenparty <870300816@qq.com> Date: 星期日, 26 九月 2021 15:37:01 +0800 Subject: [PATCH] 修复快照无法生成的BUG --- src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java index b3b2fba..860f676 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java @@ -9,11 +9,11 @@ import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform; import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory; +import com.genersoft.iot.vmp.service.IDeviceAlarmService; +import com.genersoft.iot.vmp.service.IMediaServerService; import com.genersoft.iot.vmp.storager.IRedisCatchStorage; import com.genersoft.iot.vmp.gb28181.transmit.response.impl.*; -import com.genersoft.iot.vmp.vmanager.service.IPlayService; -// import org.slf4j.Logger; -// import org.slf4j.LoggerFactory; +import com.genersoft.iot.vmp.service.IPlayService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; @@ -75,6 +75,9 @@ private SIPCommanderFroPlatform cmderFroPlatform; @Autowired + private IDeviceAlarmService deviceAlarmService; + + @Autowired private RedisUtil redis; @Autowired @@ -106,6 +109,8 @@ @Autowired private ZLMRTPServerFactory zlmrtpServerFactory; + @Autowired + private IMediaServerService mediaServerService; // 娉細杩欓噷浣跨敤娉ㄨВ浼氬鑷村惊鐜緷璧栨敞鍏ワ紝鏆傜敤springBean private SipProvider tcpSipProvider; @@ -130,6 +135,7 @@ processor.setStorager(storager); processor.setRedisCatchStorage(redisCatchStorage); processor.setZlmrtpServerFactory(zlmrtpServerFactory); + processor.setMediaServerService(mediaServerService); return processor; } else if (Request.REGISTER.equals(method)) { RegisterRequestProcessor processor = new RegisterRequestProcessor(); @@ -143,6 +149,8 @@ return processor; } else if (Request.SUBSCRIBE.equals(method)) { SubscribeRequestProcessor processor = new SubscribeRequestProcessor(); + processor.setTcpSipProvider(getTcpSipProvider()); + processor.setUdpSipProvider(getUdpSipProvider()); processor.setRequestEvent(evt); return processor; } else if (Request.ACK.equals(method)) { @@ -150,12 +158,16 @@ processor.setRequestEvent(evt); processor.setRedisCatchStorage(redisCatchStorage); processor.setZlmrtpServerFactory(zlmrtpServerFactory); + processor.setMediaServerService(mediaServerService); return processor; } else if (Request.BYE.equals(method)) { ByeRequestProcessor processor = new ByeRequestProcessor(); processor.setRequestEvent(evt); processor.setRedisCatchStorage(redisCatchStorage); + processor.setStorager(storager); processor.setZlmrtpServerFactory(zlmrtpServerFactory); + processor.setSIPCommander(cmder); + processor.setMediaServerService(mediaServerService); return processor; } else if (Request.CANCEL.equals(method)) { CancelRequestProcessor processor = new CancelRequestProcessor(); @@ -172,6 +184,7 @@ processor.setOffLineDetector(offLineDetector); processor.setCmder(cmder); processor.setCmderFroPlatform(cmderFroPlatform); + processor.setDeviceAlarmService(deviceAlarmService); processor.setStorager(storager); processor.setRedisCatchStorage(redisCatchStorage); return processor; -- Gitblit v1.8.0