From 497e581e5e26840400f5f2cd1cf083c3de5e66c2 Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期一, 27 九月 2021 15:36:41 +0800
Subject: [PATCH] 处理报警和位置上报时使用fromHeader获取deviceId, xml的deviceId作为channelId使用。

---
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 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 64a1890..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,6 +9,7 @@
 
 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.*;
@@ -72,6 +73,9 @@
 
 	@Autowired
 	private SIPCommanderFroPlatform cmderFroPlatform;
+
+	@Autowired
+	private IDeviceAlarmService deviceAlarmService;
 
 	@Autowired
 	private RedisUtil redis;
@@ -145,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)) {
@@ -178,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