From 764d04b497356ba6bcbb75fd42b51eca750f7223 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 29 五月 2024 15:02:51 +0800
Subject: [PATCH] 调整上级观看消息的发送

---
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java |   85 +++++++++++++++++++++++++++++++++---------
 1 files changed, 66 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java
old mode 100644
new mode 100755
index 0aab871..34d7077
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/MessageRequestProcessor.java
@@ -1,13 +1,18 @@
 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message;
 
 import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceNotFoundEvent;
 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
+import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
+import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
 import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
 import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
 import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
 import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import gov.nist.javax.sip.message.SIPRequest;
 import org.dom4j.DocumentException;
 import org.dom4j.Element;
 import org.slf4j.Logger;
@@ -19,6 +24,7 @@
 import javax.sip.InvalidArgumentException;
 import javax.sip.RequestEvent;
 import javax.sip.SipException;
+import javax.sip.header.CallIdHeader;
 import javax.sip.message.Response;
 import java.text.ParseException;
 import java.util.Map;
@@ -31,16 +37,22 @@
 
     private final String method = "MESSAGE";
 
-    private static Map<String, IMessageHandler> messageHandlerMap = new ConcurrentHashMap<>();
+    private static final Map<String, IMessageHandler> messageHandlerMap = new ConcurrentHashMap<>();
 
     @Autowired
     private SIPProcessorObserver sipProcessorObserver;
 
     @Autowired
-    private IVideoManagerStorager storage;
+    private IVideoManagerStorage storage;
+
+    @Autowired
+    private SipSubscribe sipSubscribe;
 
     @Autowired
     private IRedisCatchStorage redisCatchStorage;
+
+    @Autowired
+    private VideoStreamSessionManager sessionManager;
 
     @Override
     public void afterPropertiesSet() throws Exception {
@@ -54,30 +66,67 @@
 
     @Override
     public void process(RequestEvent evt) {
-        logger.debug("鎺ユ敹鍒版秷鎭細" + evt.getRequest());
+        SIPRequest sipRequest = (SIPRequest)evt.getRequest();
+//        logger.info("鎺ユ敹鍒版秷鎭細" + evt.getRequest());
         String deviceId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
+        CallIdHeader callIdHeader = sipRequest.getCallIdHeader();
+        // 鍏堜粠浼氳瘽鍐呮煡鎵�
+        SsrcTransaction ssrcTransaction = sessionManager.getSsrcTransaction(null, null, callIdHeader.getCallId(), null);
+        // 鍏煎娴峰悍 濯掍綋閫氱煡 娑堟伅from瀛楁涓嶆槸璁惧ID鐨勯棶棰�
+        if (ssrcTransaction != null) {
+            deviceId = ssrcTransaction.getDeviceId();
+        }
+        SIPRequest request = (SIPRequest) evt.getRequest();
         // 鏌ヨ璁惧鏄惁瀛樺湪
         Device device = redisCatchStorage.getDevice(deviceId);
         // 鏌ヨ涓婄骇骞冲彴鏄惁瀛樺湪
         ParentPlatform parentPlatform = storage.queryParentPlatByServerGBId(deviceId);
         try {
+            if (device != null && parentPlatform != null) {
+                String hostAddress = request.getRemoteAddress().getHostAddress();
+                int remotePort = request.getRemotePort();
+                if (device.getHostAddress().equals(hostAddress + ":" + remotePort)) {
+                    parentPlatform = null;
+                }else {
+                    device = null;
+                }
+            }
             if (device == null && parentPlatform == null) {
                 // 涓嶅瓨鍦ㄥ垯鍥炲404
-                responseAck(evt, Response.NOT_FOUND, "device id not found");
+                responseAck(request, Response.NOT_FOUND, "device "+ deviceId +" not found");
+                logger.warn("[璁惧鏈壘鍒� ]deviceId: {}, callId: {}", deviceId, callIdHeader.getCallId());
+                if (sipSubscribe.getErrorSubscribe(callIdHeader.getCallId()) != null){
+                    DeviceNotFoundEvent deviceNotFoundEvent = new DeviceNotFoundEvent(evt.getDialog());
+                    deviceNotFoundEvent.setCallId(callIdHeader.getCallId());
+                    SipSubscribe.EventResult eventResult = new SipSubscribe.EventResult(deviceNotFoundEvent);
+                    sipSubscribe.getErrorSubscribe(callIdHeader.getCallId()).response(eventResult);
+                }
             }else {
-                Element rootElement = getRootElement(evt);
-                String name = rootElement.getName();
-                IMessageHandler messageHandler = messageHandlerMap.get(name);
-                if (messageHandler != null) {
-                    if (device != null) {
-                        messageHandler.handForDevice(evt, device, rootElement);
-                    }else { // 鐢变簬涓婇潰宸茬粡鍒ゆ柇閮戒负null鍒欑洿鎺ヨ繑鍥烇紝鎵�浠ヨ繖閲宒evice鍜宲arentPlatform蹇呮湁涓�涓笉涓簄ull
-                        messageHandler.handForPlatform(evt, parentPlatform, rootElement);
+                Element rootElement;
+                try {
+                    rootElement = getRootElement(evt);
+                    if (rootElement == null) {
+                        logger.error("澶勭悊MESSAGE璇锋眰  鏈幏鍙栧埌娑堟伅浣搟}", evt.getRequest());
+                        responseAck(request, Response.BAD_REQUEST, "content is null");
+                        return;
                     }
-                }else {
-                    // 涓嶆敮鎸佺殑message
-                    // 涓嶅瓨鍦ㄥ垯鍥炲415
-                    responseAck(evt, Response.UNSUPPORTED_MEDIA_TYPE, "Unsupported message type, must Control/Notify/Query/Response");
+                    String name = rootElement.getName();
+                    IMessageHandler messageHandler = messageHandlerMap.get(name);
+                    if (messageHandler != null) {
+                        if (device != null) {
+                            messageHandler.handForDevice(evt, device, rootElement);
+                        }else { // 鐢变簬涓婇潰宸茬粡鍒ゆ柇閮戒负null鍒欑洿鎺ヨ繑鍥烇紝鎵�浠ヨ繖閲宒evice鍜宲arentPlatform蹇呮湁涓�涓笉涓簄ull
+                            messageHandler.handForPlatform(evt, parentPlatform, rootElement);
+                        }
+                    }else {
+                        // 涓嶆敮鎸佺殑message
+                        // 涓嶅瓨鍦ㄥ垯鍥炲415
+                        responseAck(request, Response.UNSUPPORTED_MEDIA_TYPE, "Unsupported message type, must Control/Notify/Query/Response");
+                    }
+                } catch (DocumentException e) {
+                    logger.warn("瑙f瀽XML娑堟伅鍐呭寮傚父", e);
+                    // 涓嶅瓨鍦ㄥ垯鍥炲404
+                    responseAck(request, Response.BAD_REQUEST, e.getMessage());
                 }
             }
         } catch (SipException e) {
@@ -86,8 +135,6 @@
             logger.warn("鍙傛暟鏃犳晥", e);
         } catch (ParseException e) {
             logger.warn("SIP鍥炲鏃惰В鏋愬紓甯�", e);
-        } catch (DocumentException e) {
-            logger.warn("瑙f瀽XML娑堟伅鍐呭寮傚父", e);
         }
     }
 

--
Gitblit v1.8.0