From 937e59143004b11a808eb93eb894ffe53871a19a Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期四, 15 四月 2021 17:48:52 +0800
Subject: [PATCH] 解决串流,解决编辑上级平台却新建了的问题

---
 src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
index 5d1cfc8..472c7fd 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
@@ -271,15 +271,21 @@
 	public boolean updateParentPlatform(ParentPlatform parentPlatform) {
 		int result = 0;
 		ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(parentPlatform.getServerGBId()); // .getDeviceGBId());
-		if ( platformMapper.getParentPlatById(parentPlatform.getServerGBId()) == null) {
+		if (parentPlatform.getId() == null ) {
 			result = platformMapper.addParentPlatform(parentPlatform);
-
 			if (parentPlatformCatch == null) {
 				parentPlatformCatch = new ParentPlatformCatch();
 				parentPlatformCatch.setParentPlatform(parentPlatform);
 				parentPlatformCatch.setId(parentPlatform.getServerGBId());
 			}
 		}else {
+			if (parentPlatformCatch == null) { // serverGBId 宸插彉鍖�
+				ParentPlatform parentPlatById = platformMapper.getParentPlatById(parentPlatform.getId());
+				// 浣跨敤鏃х殑鏌ュ嚭缂撳瓨ID
+				parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(parentPlatById.getServerGBId());
+				parentPlatformCatch.setId(parentPlatform.getServerGBId());
+				redisCatchStorage.delPlatformCatchInfo(parentPlatById.getServerGBId());
+			}
 			result = platformMapper.updateParentPlatform(parentPlatform);
 		}
 		// 鏇存柊缂撳瓨
@@ -305,8 +311,8 @@
 	}
 
 	@Override
-	public ParentPlatform queryParentPlatById(String platformGbId) {
-		return platformMapper.getParentPlatById(platformGbId);
+	public ParentPlatform queryParentPlatByServerGBId(String platformGbId) {
+		return platformMapper.getParentPlatByServerGBId(platformGbId);
 	}
 
 	@Override

--
Gitblit v1.8.0