From d7ba1cab30dba3a915fea939b0f702e660d798c2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Sat, 10 May 2025 23:22:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E5=8C=96=E9=80=9A=E9=81=93=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gb28181/session/CatalogDataManager.java   | 38 +++++++++++++------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/session/CatalogDataManager.java b/src/main/java/com/genersoft/iot/vmp/gb28181/session/CatalogDataManager.java
index 9be9a519a..c524d72c6 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/session/CatalogDataManager.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/session/CatalogDataManager.java
@@ -194,6 +194,15 @@ public class CatalogDataManager implements CommandLineRunner {
         for (String key : keySet) {
             CatalogData catalogData = dataMap.get(key);
             if (catalogData != null && deviceId.equals(catalogData.getDevice().getDeviceId())) {
+                // 此时检查是否过期
+                Instant instantBefore30S = Instant.now().minusMillis(TimeUnit.SECONDS.toMillis(30));
+                if ((catalogData.getStatus().equals(CatalogData.CatalogDataStatus.end)
+                        || catalogData.getStatus().equals(CatalogData.CatalogDataStatus.ready))
+                        && catalogData.getTime().isBefore(instantBefore30S)) {
+                    dataMap.remove(key);
+                    return false;
+                }
+
                 return !catalogData.getStatus().equals(CatalogData.CatalogDataStatus.end);
             }
         }
@@ -222,21 +231,26 @@ public class CatalogDataManager implements CommandLineRunner {
                     String deviceId = catalogData.getDevice().getDeviceId();
                     int sn = catalogData.getSn();
                     List<DeviceChannel> deviceChannelList = getDeviceChannelList(deviceId, sn);
-                    if (catalogData.getTotal() == deviceChannelList.size()) {
-                        deviceChannelService.resetChannels(catalogData.getDevice().getId(), deviceChannelList);
-                    }else {
-                        deviceChannelService.updateChannels(catalogData.getDevice(), deviceChannelList);
-                    }
-                    List<Region> regionList = getRegionList(deviceId, sn);
-                    if ( regionList!= null && !regionList.isEmpty()) {
-                        regionService.batchAdd(regionList);
-                    }
-                    List<Group> groupList = getGroupList(deviceId, sn);
-                    if (groupList != null && !groupList.isEmpty()) {
-                        groupService.batchAdd(groupList);
+                    try {
+                        if (catalogData.getTotal() == deviceChannelList.size()) {
+                            deviceChannelService.resetChannels(catalogData.getDevice().getId(), deviceChannelList);
+                        }else {
+                            deviceChannelService.updateChannels(catalogData.getDevice(), deviceChannelList);
+                        }
+                        List<Region> regionList = getRegionList(deviceId, sn);
+                        if ( regionList!= null && !regionList.isEmpty()) {
+                            regionService.batchAdd(regionList);
+                        }
+                        List<Group> groupList = getGroupList(deviceId, sn);
+                        if (groupList != null && !groupList.isEmpty()) {
+                            groupService.batchAdd(groupList);
+                        }
+                    }catch (Exception e) {
+                        log.error("[国标通道同步] 入库失败： ", e);
                     }
                     String errorMsg = "更新成功，共" + catalogData.getTotal() + "条，已更新" + deviceChannelList.size() + "条";
                     catalogData.setErrorMsg(errorMsg);
+                    catalogData.setStatus(CatalogData.CatalogDataStatus.end);
                 }else if (catalogData.getStatus().equals(CatalogData.CatalogDataStatus.ready)) {
                     String errorMsg = "同步失败，等待回复超时";
                     catalogData.setErrorMsg(errorMsg);