Merge pull request #1055 from lunasaw/dev-wvp-0905

648540858

2023-09-06 fd0ff18a71c2ba714fca7a0ca4ec8cec9048a5a3

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java

old mode 100644
new mode 100755
@@ -1,6 +1,7 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;

import com.genersoft.iot.vmp.conf.CivilCodeFileConf;
import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.session.CatalogDataCatch;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
@@ -29,6 +30,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicBoolean;

/**
 * 目录查询的回复
@@ -57,6 +59,10 @@
    @Autowired
    private CivilCodeFileConf civilCodeFileConf;

    @Autowired
    private SipConfig sipConfig;
    private AtomicBoolean processing = new AtomicBoolean(false);

    @Override
    public void afterPropertiesSet() throws Exception {
        responseMessageHandler.addHandler(cmdType, this);
@@ -64,7 +70,6 @@

    @Override
    public void handForDevice(RequestEvent evt, Device device, Element element) {
        boolean isEmpty = taskQueue.isEmpty();
        taskQueue.offer(new HandlerCatchData(evt, device, element));
        // 回复200 OK
        try {
@@ -72,8 +77,8 @@
        } catch (SipException | InvalidArgumentException | ParseException e) {
            logger.error("[命令发送失败] 目录查询回复: {}", e.getMessage());
        }
        // 如果不为空则说明已经开启消息处理
        if (isEmpty) {
        // 已经开启消息处理则跳过
        if (processing.compareAndSet(false, true)) {
            taskExecutor.execute(() -> {
                while (!taskQueue.isEmpty()) {
                    // 全局异常捕获，保证下一条可以得到处理
@@ -112,11 +117,18 @@
                                    if (channelDeviceElement == null) {
                                        continue;
                                    }
                                    DeviceChannel deviceChannel = XmlUtil.channelContentHandler(itemDevice, device, null, civilCodeFileConf);
                                    deviceChannel = SipUtils.updateGps(deviceChannel, device.getGeoCoordSys());
                                    deviceChannel.setDeviceId(take.getDevice().getDeviceId());
                                    DeviceChannel channel = XmlUtil.channelContentHandler(itemDevice, device, null, civilCodeFileConf);
                                    if (channel == null) {
                                        logger.info("[收到目录订阅]：但是解析失败 {}", new String(evt.getRequest().getRawContent()));
                                        continue;
                                    }
                                    if (channel.getParentId() != null && channel.getParentId().equals(sipConfig.getId())) {
                                        channel.setParentId(null);
                                    }
                                    SipUtils.updateGps(channel, device.getGeoCoordSys());
                                    channel.setDeviceId(take.getDevice().getDeviceId());

                                    channelList.add(deviceChannel);
                                    channelList.add(channel);
                                }
                                int sn = Integer.parseInt(snElement.getText());
                                catalogDataCatch.put(take.getDevice().getDeviceId(), sn, sumNum, take.getDevice(), channelList);
@@ -135,11 +147,12 @@
                            }

                        }
                    }catch (Exception e) {
                    } catch (Exception e) {
                        logger.warn("[收到通道] 发现未处理的异常, \r\n{}", evt.getRequest());
                        logger.error("[收到通道] 异常内容： ", e);
                    }
                }
                processing.set(false);
            });
        }