From 9d19f6b9d6b361d8b93671a553973289b40d9d33 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 22 一月 2021 09:52:11 +0800
Subject: [PATCH] Merge pull request #46 from lawrencehj/wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java
index 031fb09..ca116d5 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java
@@ -110,7 +110,7 @@
         if (logger.isDebugEnabled()) {
             logger.debug("鏌ヨ鎵�鏈変笂绾ц澶嘇PI璋冪敤");
         }
-        if (StringUtils.isEmpty(parentPlatform.getDeviceGBId())
+        if (StringUtils.isEmpty(parentPlatform.getServerGBId())
         ){
             return new ResponseEntity<>("missing parameters", HttpStatus.BAD_REQUEST);
         }
@@ -118,14 +118,14 @@
         // 鍙戦�佺绾挎秷鎭�,鏃犺鏄惁鎴愬姛閮藉垹闄ょ紦瀛�
         commanderForPlatform.unregister(parentPlatform, (event -> {
             // 娓呯┖redis缂撳瓨
-            redisCatchStorage.delPlatformCatchInfo(parentPlatform.getDeviceGBId());
-            redisCatchStorage.delPlatformKeepalive(parentPlatform.getDeviceGBId());
-            redisCatchStorage.delPlatformRegister(parentPlatform.getDeviceGBId());
+            redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
+            redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
+            redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
         }), (event -> {
             // 娓呯┖redis缂撳瓨
-            redisCatchStorage.delPlatformCatchInfo(parentPlatform.getDeviceGBId());
-            redisCatchStorage.delPlatformKeepalive(parentPlatform.getDeviceGBId());
-            redisCatchStorage.delPlatformRegister(parentPlatform.getDeviceGBId());
+            redisCatchStorage.delPlatformCatchInfo(parentPlatform.getServerGBId());
+            redisCatchStorage.delPlatformKeepalive(parentPlatform.getServerGBId());
+            redisCatchStorage.delPlatformRegister(parentPlatform.getServerGBId());
         }));
 
         boolean deleteResult = storager.deleteParentPlatform(parentPlatform);

--
Gitblit v1.8.0