From c592740efa9d907eac3ad7d8f6e720608f3e962f Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期日, 01 五月 2022 21:33:56 +0800
Subject: [PATCH] 升级shelljs，解决较高版本node打包时的警告
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
index 5ae8053..42fcdeb 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
@@ -149,8 +149,7 @@
subscribeInfo.setDialog(dialog);
}
String sn = XmlUtil.getText(rootElement, "SN");
- String key = VideoManagerConstants.SIP_SUBSCRIBE_PREFIX + userSetting.getServerId() + "_MobilePosition_" + platformId;
- logger.info("[notify-MobilePosition]: {}", platformId);
+ logger.info("[鍥炲 绉诲姩浣嶇疆璁㈤槄]: {}", platformId);
StringBuilder resultXml = new StringBuilder(200);
resultXml.append("<?xml version=\"1.0\" ?>\r\n")
.append("<Response>\r\n")
@@ -161,14 +160,25 @@
.append("</Response>\r\n");
if (subscribeInfo.getExpires() > 0) {
- if (subscribeHolder.getMobilePositionSubscribe(platformId) != null) {
- dynamicTask.stop(key);
- }
String interval = XmlUtil.getText(rootElement, "Interval"); // GPS涓婃姤鏃堕棿闂撮殧
- dynamicTask.startCron(key, new MobilePositionSubscribeHandlerTask(redisCatchStorage, sipCommanderForPlatform, storager, platformId, sn, key, subscribeHolder), Integer.parseInt(interval) -1 );
+ if (interval == null) {
+ subscribeInfo.setGpsInterval(5);
+ }else {
+ subscribeInfo.setGpsInterval(Integer.parseInt(interval));
+ }
+
+ subscribeInfo.setSn(sn);
subscribeHolder.putMobilePositionSubscribe(platformId, subscribeInfo);
+// if (subscribeHolder.getMobilePositionSubscribe(platformId) == null ) {
+// subscribeHolder.putMobilePositionSubscribe(platformId, subscribeInfo);
+// }else {
+// if (subscribeHolder.getMobilePositionSubscribe(platformId).getDialog() != null
+// && subscribeHolder.getMobilePositionSubscribe(platformId).getDialog().getState() != null
+// && !subscribeHolder.getMobilePositionSubscribe(platformId).getDialog().getState().equals(DialogState.CONFIRMED)) {
+// subscribeHolder.putMobilePositionSubscribe(platformId, subscribeInfo);
+// }
+// }
}else if (subscribeInfo.getExpires() == 0) {
- dynamicTask.stop(key);
subscribeHolder.removeMobilePositionSubscribe(platformId);
}
@@ -192,6 +202,7 @@
String platformId = SipUtils.getUserIdFromFromHeader(evt.getRequest());
String deviceID = XmlUtil.getText(rootElement, "DeviceID");
ParentPlatform platform = storager.queryParentPlatByServerGBId(platformId);
+ if (platform == null)return;
SubscribeInfo subscribeInfo = new SubscribeInfo(evt, platformId);
if (evt.getServerTransaction() == null) {
ServerTransaction serverTransaction = platform.getTransport().equals("TCP") ? tcpSipProvider.getNewServerTransaction(evt.getRequest())
@@ -202,8 +213,7 @@
subscribeInfo.setDialog(dialog);
}
String sn = XmlUtil.getText(rootElement, "SN");
- String key = VideoManagerConstants.SIP_SUBSCRIBE_PREFIX + userSetting.getServerId() + "_Catalog_" + platformId;
- logger.info("[notify-Catalog]: {}", platformId);
+ logger.info("[鍥炲 鐩綍璁㈤槄]: {}/{}", platformId, deviceID);
StringBuilder resultXml = new StringBuilder(200);
resultXml.append("<?xml version=\"1.0\" ?>\r\n")
.append("<Response>\r\n")
--
Gitblit v1.8.0