From 22fcab375f8c4944f35e7943efed565c8102d5b6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Sat, 26 Oct 2024 23:28:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=8D=87Catalog=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=A4=84=E7=90=86=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmd/CatalogResponseMessageHandler.java    | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java
index 971b80f3..26d08778 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java
@@ -161,31 +161,30 @@ public class CatalogResponseMessageHandler extends SIPRequestProcessorParent imp
                         int sn = Integer.parseInt(snElement.getText());
                         catalogDataCatch.put(take.getDevice().getDeviceId(), sn, sumNum, take.getDevice(),
                                 channelList, regionList, groupList);
-                        List<DeviceChannel> deviceChannelList = catalogDataCatch.getDeviceChannelList(take.getDevice().getDeviceId());
-                        log.info("[收到通道]设备: {} -> {}个，{}/{}", take.getDevice().getDeviceId(), channelList.size(), deviceChannelList.size(), sumNum);
-                        if (deviceChannelList.size() == sumNum) {
-                            // 数据已经完整接收， 此时可能存在某个设备离线变上线的情况，但是考虑到性能，此处不做处理，
-                            // 目前支持设备通道上线通知时和设备上线时向上级通知
-                            boolean resetChannelsResult = saveData(take.getDevice(), sn);
-                            if (!resetChannelsResult) {
-                                String errorMsg = "接收成功，写入失败，共" + sumNum + "条，已接收" + catalogDataCatch.getDeviceChannelList(take.getDevice().getDeviceId()).size() + "条";
-                                catalogDataCatch.setChannelSyncEnd(take.getDevice().getDeviceId(), errorMsg);
-                            } else {
-                                catalogDataCatch.setChannelSyncEnd(take.getDevice().getDeviceId(), null);
-                            }
-                        }
+                        log.info("[收到通道]设备: {} -> {}个，{}/{}", take.getDevice().getDeviceId(), channelList.size(), catalogDataCatch.size(take.getDevice().getDeviceId()), sumNum);
                     }
-
                 }
             } catch (Exception e) {
                 log.warn("[收到通道] 发现未处理的异常, \r\n{}", evt.getRequest());
                 log.error("[收到通道] 异常内容： ", e);
+            } finally {
+                if (catalogDataCatch.size(take.getDevice().getDeviceId()) == catalogDataCatch.sumNum(take.getDevice().getDeviceId())) {
+                    // 数据已经完整接收， 此时可能存在某个设备离线变上线的情况，但是考虑到性能，此处不做处理，
+                    // 目前支持设备通道上线通知时和设备上线时向上级通知
+                    boolean resetChannelsResult = saveData(take.getDevice());
+                    if (!resetChannelsResult) {
+                        String errorMsg = "接收成功，写入失败，共" + catalogDataCatch.sumNum(take.getDevice().getDeviceId()) + "条，已接收" + catalogDataCatch.getDeviceChannelList(take.getDevice().getDeviceId()).size() + "条";
+                        catalogDataCatch.setChannelSyncEnd(take.getDevice().getDeviceId(), errorMsg);
+                    } else {
+                        catalogDataCatch.setChannelSyncEnd(take.getDevice().getDeviceId(), null);
+                    }
+                }
             }
         }
     }
 
     @Transactional
-    public boolean saveData(Device device, int sn) {
+    public boolean saveData(Device device) {
 
         boolean result = true;
         List<DeviceChannel> deviceChannelList = catalogDataCatch.getDeviceChannelList(device.getDeviceId());