Merge branch '2.6.9' into wvp-28181-2.0

648540858

2024-01-08 b15e559eae82db811b31f1e3c47e3be027f20e27

Merge branch '2.6.9' into wvp-28181-2.0

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

@@ -13,6 +13,7 @@
import com.genersoft.iot.vmp.gb28181.utils.XmlUtil;
import com.genersoft.iot.vmp.service.IDeviceChannelService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.utils.DateUtil;
import org.dom4j.DocumentException;
import org.dom4j.Element;
import org.slf4j.Logger;
@@ -185,6 +186,7 @@
                            // 判断此通道是否存在
                            DeviceChannel deviceChannel = deviceChannelService.getOne(deviceId, channel.getChannelId());
                            if (deviceChannel != null) {
                                logger.info("[增加通道] 已存在，不发送通知只更新，设备: {}, 通道 {}", device.getDeviceId(), channel.getChannelId());
                                channel.setId(deviceChannel.getId());
                                updateChannelMap.put(channel.getChannelId(), channel);
                                if (updateChannelMap.keySet().size() > 300) {
@@ -222,6 +224,7 @@
                            DeviceChannel deviceChannelForUpdate = deviceChannelService.getOne(deviceId, channel.getChannelId());
                            if (deviceChannelForUpdate != null) {
                                channel.setId(deviceChannelForUpdate.getId());
                                channel.setUpdateTime(DateUtil.getNow());
                                updateChannelMap.put(channel.getChannelId(), channel);
                                if (updateChannelMap.keySet().size() > 300) {
                                    executeSaveForUpdate();
@@ -244,11 +247,11 @@
                    // 转发变化信息
                    eventPublisher.catalogEventPublish(null, channel, event);

                    if (updateChannelMap.keySet().size() > 0
                            || addChannelMap.keySet().size() > 0
                            || updateChannelOnlineList.size() > 0
                            || updateChannelOfflineList.size() > 0
                            || deleteChannelList.size() > 0) {
                    if (!updateChannelMap.keySet().isEmpty()
                            || !addChannelMap.keySet().isEmpty()
                            || !updateChannelOnlineList.isEmpty()
                            || !updateChannelOfflineList.isEmpty()
                            || !deleteChannelList.isEmpty()) {

                        if (!dynamicTask.contains(talkKey)) {
                            dynamicTask.startDelay(talkKey, this::executeSave, 1000);
@@ -262,16 +265,36 @@
    }

    private void executeSave(){
        try {
        executeSaveForAdd();
        } catch (Exception e) {
            logger.error("[存储收到的增加通道] 异常： ", e );
        }
        try {
        executeSaveForUpdate();
        } catch (Exception e) {
            logger.error("[存储收到的更新通道] 异常： ", e );
        }
        try {
        executeSaveForDelete();
        } catch (Exception e) {
            logger.error("[存储收到的删除通道] 异常： ", e );
        }
        try {
        executeSaveForOnline();
        } catch (Exception e) {
            logger.error("[存储收到的通道上线] 异常： ", e );
        }
        try {
        executeSaveForOffline();
        } catch (Exception e) {
            logger.error("[存储收到的通道离线] 异常： ", e );
        }
        dynamicTask.stop(talkKey);
    }

    private void executeSaveForUpdate(){
        if (updateChannelMap.values().size() > 0) {
        if (!updateChannelMap.values().isEmpty()) {
            ArrayList<DeviceChannel> deviceChannels = new ArrayList<>(updateChannelMap.values());
            updateChannelMap.clear();
            deviceChannelService.batchUpdateChannel(deviceChannels);
@@ -280,7 +303,7 @@
    }

    private void executeSaveForAdd(){
        if (addChannelMap.values().size() > 0) {
        if (!addChannelMap.values().isEmpty()) {
            ArrayList<DeviceChannel> deviceChannels = new ArrayList<>(addChannelMap.values());
            addChannelMap.clear();
            deviceChannelService.batchAddChannel(deviceChannels);
@@ -288,21 +311,21 @@
    }

    private void executeSaveForDelete(){
        if (deleteChannelList.size() > 0) {
        if (!deleteChannelList.isEmpty()) {
            deviceChannelService.deleteChannels(deleteChannelList);
            deleteChannelList.clear();
        }
    }

    private void executeSaveForOnline(){
        if (updateChannelOnlineList.size() > 0) {
        if (!updateChannelOnlineList.isEmpty()) {
            deviceChannelService.channelsOnline(updateChannelOnlineList);
            updateChannelOnlineList.clear();
        }
    }

    private void executeSaveForOffline(){
        if (updateChannelOfflineList.size() > 0) {
        if (!updateChannelOfflineList.isEmpty()) {
            deviceChannelService.channelsOffline(updateChannelOfflineList);
            updateChannelOfflineList.clear();
        }

 src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGpsMsgListener.java

@@ -50,11 +50,12 @@
                    Message msg = taskQueue.poll();
                    try {
                        GPSMsgInfo gpsMsgInfo = JSON.parseObject(msg.getBody(), GPSMsgInfo.class);
                        logger.info("[REDIS的位置变化通知], {}", JSON.toJSONString(gpsMsgInfo));
                        // 只是放入redis缓存起来
                        redisCatchStorage.updateGpsMsgInfo(gpsMsgInfo);
                    }catch (Exception e) {
                        logger.warn("[REDIS的ALARM通知] 发现未处理的异常, \r\n{}", JSON.toJSONString(message));
                        logger.error("[REDIS的ALARM通知] 异常内容： ", e);
                        logger.warn("[REDIS的位置变化通知] 发现未处理的异常, \r\n{}", JSON.toJSONString(message));
                        logger.error("[REDIS的位置变化通知] 异常内容： ", e);
                    }
                }
            });