From bea63f67e75ea6c38d946c2ee463260fcf815f87 Mon Sep 17 00:00:00 2001
From: Fang <costa11@qq.com>
Date: 星期一, 07 三月 2022 14:21:29 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java
index b6040aa..ffac1d0 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/RegisterResponseProcessor.java
@@ -85,19 +85,18 @@
redisCatchStorage.delPlatformRegisterInfo(callId);
parentPlatform.setStatus("娉ㄥ唽".equals(action));
// 鍙栧洖Expires璁剧疆锛岄伩鍏嶆敞閿�杩囩▼涓缃负0
- ParentPlatform parentPlatformTmp = storager.queryParentPlatByServerGBId(platformGBId);
- String expires = parentPlatformTmp.getExpires();
- parentPlatform.setExpires(expires);
- parentPlatform.setId(parentPlatformTmp.getId());
+ if (!parentPlatformCatch.getParentPlatform().getExpires().equals("0")) {
+ ParentPlatform parentPlatformTmp = storager.queryParentPlatByServerGBId(platformGBId);
+ String expires = parentPlatformTmp.getExpires();
+ parentPlatform.setExpires(expires);
+ parentPlatform.setId(parentPlatformTmp.getId());
+ redisCatchStorage.updatePlatformRegister(parentPlatform);
+ redisCatchStorage.updatePlatformKeepalive(parentPlatform);
+ parentPlatformCatch.setParentPlatform(parentPlatform);
+ redisCatchStorage.updatePlatformCatchInfo(parentPlatformCatch);
+ }
storager.updateParentPlatformStatus(platformGBId, "娉ㄥ唽".equals(action));
- redisCatchStorage.updatePlatformRegister(parentPlatform);
-
- redisCatchStorage.updatePlatformKeepalive(parentPlatform);
-
- parentPlatformCatch.setParentPlatform(parentPlatform);
-
- redisCatchStorage.updatePlatformCatchInfo(parentPlatformCatch);
}
}
--
Gitblit v1.8.0