From 193e1a24a19b6bd97330a9a5cd3ea172d85d20ce Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 23 三月 2023 20:52:05 +0800
Subject: [PATCH] 优化对assist接口的代理

---
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.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/response/cmd/RecordInfoResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java
index 9d28ec5..a667c67 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java
@@ -94,8 +94,7 @@
                     recordInfo.setCount(sumNum);
                     eventPublisher.recordEndEventPush(recordInfo);
                     releaseRequest(device.getDeviceId(), sn,recordInfo);
-                } else
-                    {
+                } else {
                     Iterator<Element> recordListIterator = recordListElement.elementIterator();
                     if (recordListIterator != null) {
                         List<RecordItem> recordList = new ArrayList<>();
@@ -151,7 +150,8 @@
                     }
                 }
             } catch (Exception e) {
-                logger.error("[鍥芥爣褰曞儚] 鍙戠幇鏈鐞嗙殑寮傚父, "+e.getMessage(), e);
+                logger.error("[鍥芥爣褰曞儚] 鍙戠幇鏈鐞嗙殑寮傚父, \r\n{}", evt.getRequest());
+                logger.error("[鍥芥爣褰曞儚] 寮傚父鍐呭锛� ", e);
             }
         });
     }
@@ -163,12 +163,13 @@
 
     public void releaseRequest(String deviceId, String sn,RecordInfo recordInfo){
         String key = DeferredResultHolder.CALLBACK_CMD_RECORDINFO + deviceId + sn;
-        if(null!=recordInfo.getRecordList()){
+        // 瀵规暟鎹繘琛屾帓搴�
+        if(recordInfo!=null && recordInfo.getRecordList()!=null) {
             Collections.sort(recordInfo.getRecordList());
         }else{
             recordInfo.setRecordList(new ArrayList<>());
         }
-        // 瀵规暟鎹繘琛屾帓搴�
+
         RequestMessage msg = new RequestMessage();
         msg.setKey(key);
         msg.setData(recordInfo);

--
Gitblit v1.8.0