Merge branch '2.6.8' into wvp-28181-2.0

648540858

2023-06-19 6b3732b8c43165342b7521b1e3ea788e471d58e8

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java

@@ -72,7 +72,7 @@
         String deviceId = SipUtils.getUserIdFromFromHeader(fromHeader);

         Device device = redisCatchStorage.getDevice(deviceId);
         if (device == null || device.getOnline() == 0) {
         if (device == null || !device.isOnLine()) {
            logger.warn("[收到目录订阅]：{}, 但是设备已经离线", (device != null ? device.getDeviceId():"" ));
            return;
         }
@@ -182,6 +182,11 @@
                        }
                     }else {
                        addChannelMap.put(channel.getChannelId(), channel);
                        if (userSetting.getDeviceStatusNotify()) {
                           // 发送redis消息
                           redisCatchStorage.sendChannelAddOrDelete(device.getDeviceId(), channel.getChannelId(), true);
                        }

                        if (addChannelMap.keySet().size() > 300) {
                           executeSaveForAdd();
                        }
@@ -192,6 +197,10 @@
                     // 删除
                     logger.info("[收到删除通道通知] 来自设备: {}, 通道 {}", device.getDeviceId(), channel.getChannelId());
                     deleteChannelList.add(channel);
                     if (userSetting.getDeviceStatusNotify()) {
                        // 发送redis消息
                        redisCatchStorage.sendChannelAddOrDelete(device.getDeviceId(), channel.getChannelId(), false);
                     }
                     if (deleteChannelList.size() > 300) {
                        executeSaveForDelete();
                     }
@@ -212,6 +221,10 @@
                        if (addChannelMap.keySet().size() > 300) {
                           executeSaveForAdd();
                        }
                        if (userSetting.getDeviceStatusNotify()) {
                           // 发送redis消息
                           redisCatchStorage.sendChannelAddOrDelete(device.getDeviceId(), channel.getChannelId(), true);
                        }
                     }
                     break;
                  default: