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 @@ public class NotifyRequestProcessor extends SIPRequestProcessorParent implements
 							}
 						} 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

@@ -55,25 +55,9 @@ public class CatalogResponseMessageHandler extends SIPRequestProcessorParent imp
     @Autowired
     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
     private ThreadPoolTaskExecutor taskExecutor;
@@ -153,6 +137,7 @@ public class CatalogResponseMessageHandler extends SIPRequestProcessorParent imp
 
                     }
                 }
+                taskQueueHandlerRun = false;
             });
         }
 

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

@@ -148,10 +148,9 @@ public class RecordInfoResponseMessageHandler extends SIPRequestProcessorParent
                             }
                         } 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 org.springframework.util.ObjectUtils;
 
 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;