From aab43e7bf650aa77f6992e584966d962b00f868b Mon Sep 17 00:00:00 2001
From: fanshuai <1141904845@qq.com>
Date: Fri, 20 Sep 2024 14:52:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E5=B9=B2=E6=8E=89=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ModelsServiceImpl.java       |  2 ++
 .../service/impl/NewDatasetServiceImpl.java   |  3 ++-
 .../com/ruoyi/platform/utils/DVCUtils.java    | 27 +++++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
index ec1342ab..07880e77 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
@@ -700,6 +700,8 @@ public class ModelsServiceImpl implements ModelsService {
             Map<String, Object> stringObjectMap = YamlUtils.loadYamlFile(metaPath + "/" + "metadata.yaml");
             ModelMetaVo oldModelVo = ConvertUtil.convertMapToObject(stringObjectMap, ModelMetaVo.class);
 
+            //检查是否存在本地重名分支，有的话干掉
+            dvcUtils.deleteLocalBranch(rootPath, branchName);
             // 创建本地分支
             dvcUtils.createLocalBranchBasedOnMaster(rootPath, branchName);
             //dvc checkout
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java
index 4357f395..cd2f20ef 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java
@@ -184,7 +184,8 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         //部分信息在前面的版本里面，从那边取过来
         Map<String, Object> stringObjectMap = YamlUtils.loadYamlFile(localPath + "/" + "dataset.yaml");
         NewDatasetVo newDatasetVo = ConvertUtil.convertMapToObject(stringObjectMap, NewDatasetVo.class);
-
+        //检查是否存在本地重名分支，有的话干掉
+        dvcUtils.deleteLocalBranch(localPath, branchName);
         // 创建本地分支
         dvcUtils.createLocalBranchBasedOnMaster(localPath, branchName);
 
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DVCUtils.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DVCUtils.java
index 52cfa450..9f3aef36 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DVCUtils.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DVCUtils.java
@@ -258,6 +258,33 @@ public class DVCUtils {
             log.error("Error occurred while creating local branch", e);
         }
     }
+    /**
+     * 删除本地分支
+     *
+     * @param localPath  本地仓库路径
+     * @param branchName 要删除的分支名称
+     */
+    public void deleteLocalBranch(String localPath, String branchName) throws IOException, GitAPIException {
+        FileRepositoryBuilder builder = new FileRepositoryBuilder();
+        Repository repository = builder.setGitDir(new File(localPath + "/.git"))
+                .readEnvironment()
+                .findGitDir()
+                .build();
+
+        try (Git git = new Git(repository)) {
+            // 获取所有本地分支
+            for (Ref ref : git.branchList().call()) {
+                String refName = ref.getName();
+                if (refName.endsWith("/" + branchName)) {
+                    // 删除本地分支
+                    git.branchDelete().setBranchNames(refName).setForce(true).call();
+                    log.info("Deleted branch: " + branchName);
+                    return;
+                }
+            }
+            log.info("Branch not found: " + branchName);
+        }
+    }
 
     /**
      * 基于 master 创建本地分支