From bf97908c5eebc3fdd319e2e7ebc67df30ba7af86 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 26 九月 2022 10:38:48 +0800
Subject: [PATCH] Merge pull request #626 from 648540858/wvp-dialog
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java | 3 +--
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java | 3 +--
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java | 1 +
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java | 17 +----------------
4 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java
index 84bf0b8..f78ee18 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java
+++ b/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) {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java
index 94fed56..0df4610 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java
+++ b/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;
});
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java
index fa741de..50a4ed8 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java
+++ b/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;
});
}
diff --git a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java
index 2042b9a..d99cc98 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java
+++ b/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;
--
Gitblit v1.8.0