Merge pull request #626 from 648540858/wvp-dialog

648540858

2022-09-26 bf97908c5eebc3fdd319e2e7ebc67df30ba7af86

Merge pull request #626 from 648540858/wvp-dialog

合并bug修复

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

@@ -124,10 +124,9 @@
                            }
                        } catch (DocumentException e) {
                            logger.error("处理NOTIFY消息时错误", e);
                        } finally {
                            taskQueueHandlerRun = false;
                        }
                    }
                    taskQueueHandlerRun = false;
                });
            }
        } catch (SipException | InvalidArgumentException | ParseException e) {

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

@@ -56,23 +56,7 @@
    private IVideoManagerStorage storager;

    @Autowired
    private DeferredResultHolder deferredResultHolder;

    @Autowired
    private CatalogDataCatch catalogDataCatch;

    @Autowired
    private SipConfig config;

    @Autowired
    private EventPublisher publisher;

    //by brewswang
    @Autowired
    private UserSetting userSetting;

    @Autowired
    private IRedisCatchStorage redisCatchStorage;

    @Qualifier("taskExecutor")
    @Autowired
@@ -153,6 +137,7 @@

                    }
                }
                taskQueueHandlerRun = false;
            });
        }


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

@@ -148,10 +148,9 @@
                            }
                        } catch (DocumentException e) {
                            logger.error("xml解析异常： ", e);
                        } finally {
                            taskQueueHandlerRun = false;
                        }
                    }
                    taskQueueHandlerRun = false;
                });
            }


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

@@ -18,6 +18,7 @@

import javax.sip.InvalidArgumentException;
import javax.sip.SipException;
import javax.validation.constraints.NotNull;
import java.text.ParseException;
import java.util.List;
import java.util.concurrent.ConcurrentLinkedQueue;