From d7a1b94f905c5f28c9c8f2d48c3f9e28ebcf9cc4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 24 九月 2022 21:04:58 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'

---
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/RecordInfoQueryMessageHandler.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/RecordInfoQueryMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/RecordInfoQueryMessageHandler.java
index 4b6c902..49e04e9 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/RecordInfoQueryMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/RecordInfoQueryMessageHandler.java
@@ -21,6 +21,7 @@
 
 import javax.sip.InvalidArgumentException;
 import javax.sip.RequestEvent;
+import javax.sip.ServerTransaction;
 import javax.sip.SipException;
 import javax.sip.header.FromHeader;
 import javax.sip.message.Response;
@@ -68,7 +69,7 @@
     public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element rootElement) {
 
         FromHeader fromHeader = (FromHeader) evt.getRequest().getHeader(FromHeader.NAME);
-
+        ServerTransaction serverTransaction = getServerTransaction(evt);
         Element snElement = rootElement.element("SN");
         int sn = Integer.parseInt(snElement.getText());
         Element deviceIDElement = rootElement.element("DeviceID");
@@ -108,7 +109,7 @@
                     DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(endTime), sn, secrecy, type, (eventResult -> {
                         // 鍥炲200 OK
                         try {
-                            responseAck(evt, Response.OK);
+                            responseAck(serverTransaction, Response.OK);
                         } catch (SipException e) {
                             e.printStackTrace();
                         } catch (InvalidArgumentException e) {
@@ -119,7 +120,7 @@
                     }),(eventResult -> {
                         // 鏌ヨ澶辫触
                         try {
-                            responseAck(evt, eventResult.statusCode, eventResult.msg);
+                            responseAck(serverTransaction, eventResult.statusCode, eventResult.msg);
                         } catch (SipException e) {
                             e.printStackTrace();
                         } catch (InvalidArgumentException e) {
@@ -132,7 +133,7 @@
         }else if (channelSources.get(1).getCount() > 0) { // 鐩存挱娴�
             // TODO
             try {
-                responseAck(evt, Response.NOT_IMPLEMENTED); // 鍥炲鏈疄鐜�
+                responseAck(serverTransaction, Response.NOT_IMPLEMENTED); // 鍥炲鏈疄鐜�
             } catch (SipException e) {
                 e.printStackTrace();
             } catch (InvalidArgumentException e) {
@@ -142,7 +143,7 @@
             }
         }else { // 閿欒鐨勮姹�
             try {
-                responseAck(evt, Response.BAD_REQUEST);
+                responseAck(serverTransaction, Response.BAD_REQUEST);
             } catch (SipException e) {
                 e.printStackTrace();
             } catch (InvalidArgumentException e) {

--
Gitblit v1.8.0