From c951c620a56d680fb986ba6b38e6a8f7a379f309 Mon Sep 17 00:00:00 2001
From: duanguoqiang <duanguoqiang4@huawei.com>
Date: Wed, 14 Aug 2024 16:08:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3portal=E6=B8=85=E7=90=86?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=97=B6=E6=8A=A5=E9=94=99=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=88=B0=E5=A4=9A=E6=9D=A1=E8=AE=B0=E5=BD=95=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/MigrationMqInstanceService.java   | 15 ++++++++++
 .../impl/MigrationMqInstanceServiceImpl.java  | 28 +++++++++++++++++--
 .../impl/MigrationTaskHostRefServiceImpl.java |  2 +-
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/service/MigrationMqInstanceService.java b/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/service/MigrationMqInstanceService.java
index 31e659a48..27db3d234 100644
--- a/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/service/MigrationMqInstanceService.java
+++ b/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/service/MigrationMqInstanceService.java
@@ -69,4 +69,19 @@ public interface MigrationMqInstanceService extends IService<MigrationThirdParty
      * @return String
      */
     String removeInstance(String host);
+
+    /**
+     * save third party software config
+     *
+     * @param thirdPartySoftwareConfig third party software config
+     */
+    void saveRecord(MigrationThirdPartySoftwareConfig thirdPartySoftwareConfig);
+
+    /**
+     * get one third party software config by kafka ip
+     *
+     * @param kafkaIp kafka ip
+     * @return MigrationThirdPartySoftwareConfig
+     */
+    MigrationThirdPartySoftwareConfig getOneByKafkaIp(String kafkaIp);
 }
diff --git a/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/service/impl/MigrationMqInstanceServiceImpl.java b/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/service/impl/MigrationMqInstanceServiceImpl.java
index 9b02fd344..045618e05 100644
--- a/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/service/impl/MigrationMqInstanceServiceImpl.java
+++ b/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/service/impl/MigrationMqInstanceServiceImpl.java
@@ -13,6 +13,7 @@
 
 package org.opengauss.admin.plugin.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -24,6 +25,7 @@ import org.opengauss.admin.plugin.mapper.MigrationThirdPartySoftwareInstanceMapp
 import org.opengauss.admin.plugin.service.MigrationMqInstanceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -77,7 +79,8 @@ public class MigrationMqInstanceServiceImpl extends ServiceImpl<MigrationThirdPa
     @Override
     public List<String> listBindHostsByPortalHost(String host) {
         LambdaQueryWrapper<MigrationThirdPartySoftwareConfig> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(MigrationThirdPartySoftwareConfig::getKafkaIp, host);
+        wrapper.eq(MigrationThirdPartySoftwareConfig::getKafkaIp, host)
+                .isNotNull(MigrationThirdPartySoftwareConfig::getBindPortalHost);
         MigrationThirdPartySoftwareConfig thirdPartySoftwareConfig = getOne(wrapper);
         if (thirdPartySoftwareConfig == null) {
             return null;
@@ -111,13 +114,13 @@ public class MigrationMqInstanceServiceImpl extends ServiceImpl<MigrationThirdPa
                 // 没有绑定其他的kafka 需要删除自己部署的kafka
                 wrapper.clear();
                 wrapper.eq(MigrationThirdPartySoftwareConfig::getKafkaIp, host);
-                MigrationThirdPartySoftwareConfig removeSoftWareRecord = getOne(wrapper);
+                List<MigrationThirdPartySoftwareConfig> removeSoftWareRecord = list(wrapper);
                 remove(wrapper);
                 if (removeSoftWareRecord == null) {
                     log.info("remove soft ware record is null");
                     return null;
                 }
-                return removeSoftWareRecord.getInstallDir();
+                return removeSoftWareRecord.get(0).getInstallDir();
             } else {
                 // 绑定了其他的kafka 在绑定列表里删除
                 String bindPortalHost = thirdPartySoftwareConfig.getBindPortalHost();
@@ -132,4 +135,23 @@ public class MigrationMqInstanceServiceImpl extends ServiceImpl<MigrationThirdPa
         }
         return null;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveRecord(MigrationThirdPartySoftwareConfig thirdPartySoftwareConfig) {
+        MigrationThirdPartySoftwareConfig newThirdPartySoftwareConfig = new MigrationThirdPartySoftwareConfig();
+        BeanUtil.copyProperties(thirdPartySoftwareConfig, newThirdPartySoftwareConfig);
+        MigrationThirdPartySoftwareConfig old = getOneByKafkaIp(thirdPartySoftwareConfig.getKafkaIp());
+        if (old != null) {
+            newThirdPartySoftwareConfig.setId(old.getId());
+        }
+        saveOrUpdate(newThirdPartySoftwareConfig);
+    }
+
+    @Override
+    public MigrationThirdPartySoftwareConfig getOneByKafkaIp(String kafkaIp) {
+        LambdaQueryWrapper<MigrationThirdPartySoftwareConfig> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(MigrationThirdPartySoftwareConfig::getKafkaIp, kafkaIp).last("limit 1");
+        return getOne(queryWrapper);
+    }
 }
diff --git a/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/service/impl/MigrationTaskHostRefServiceImpl.java b/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/service/impl/MigrationTaskHostRefServiceImpl.java
index d112a91bf..337f3625b 100644
--- a/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/service/impl/MigrationTaskHostRefServiceImpl.java
+++ b/plugins/data-migration/src/main/java/org/opengauss/admin/plugin/service/impl/MigrationTaskHostRefServiceImpl.java
@@ -640,7 +640,7 @@ public class MigrationTaskHostRefServiceImpl extends ServiceImpl<MigrationTaskHo
                     .build();
             thirdPartySoftwareConfig.replacePathHome(physicalInstallParams.getRunUser());
             log.error("thirdPartySoftwareConfig = {}", thirdPartySoftwareConfig);
-            migrationThirdPartySoftwareInstanceService.save(thirdPartySoftwareConfig);
+            migrationThirdPartySoftwareInstanceService.saveRecord(thirdPartySoftwareConfig);
         } else {
             thirdPartySoftwareConfig = migrationThirdPartySoftwareInstanceService.getById(install.getKafkaBindId());
             if (thirdPartySoftwareConfig == null) {
-- 
Gitee