优化dvc测试

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java

@@ -568,9 +568,6 @@ public class ModelsServiceImpl implements ModelsService {
     @Override
     public String newCreateModel(ModelsVo modelsVo) {
         try {
-            if ("master".equals(modelsVo.getVersion()) || "origin".equals(modelsVo.getVersion())) {
-                throw new Exception("不允许创建" + modelsVo.getVersion() + "分支");
-            }
             String token = gitService.checkoutToken();
             LoginUser loginUser = SecurityUtils.getLoginUser();
             String ci4sUsername = loginUser.getUsername();
@@ -615,7 +612,6 @@ public class ModelsServiceImpl implements ModelsService {
 
             String owner = (String) userInfo.get("login");
             String projectUrl = gitCloneEndpoint + "/" + owner + "/" + repositoryName + ".git";
-            String sourcePath = modelsVo.getModelVersionVos().get(0).getUrl();
             String relationPath = ci4sUsername + "/model/" + gitlinIid + "/" + repositoryName + "/origin";
             String rootPath = localPath + relationPath;
             String modelPath = rootPath + "/model";
@@ -626,10 +622,6 @@ public class ModelsServiceImpl implements ModelsService {
             gitService.createBranch(token, owner, repositoryName, "origin", "master");
             dvcUtils.gitClone(rootPath, projectUrl, "origin", gitLinkUsername, decryptGitLinkPassword);
 
-            //干掉目标文件夹
-            dvcUtils.deleteDirectory(modelPath);
-            dvcUtils.moveFiles(sourcePath, modelPath);
-
             //拼接生产的元数据后写入yaml文件
             ModelMetaVo modelMetaVo = new ModelMetaVo();
             BeanUtils.copyProperties(modelsVo, modelMetaVo);
@@ -646,18 +638,18 @@ public class ModelsServiceImpl implements ModelsService {
 
             Map<String, Object> metaMap = JSON.parseObject(JSON.toJSONString(modelMetaVo), Map.class);
             YamlUtils.generateYamlFile(metaMap, metaPath, "metadata");
-            String meta = JSON.toJSONString(modelMetaVo);
+//            String meta = JSON.toJSONString(modelMetaVo);
 
             //保存模型依赖
-            modelDependency.setRepoId(gitlinIid);
-            modelDependency.setIdentifier(repositoryName);
-            modelDependency.setModelName(modelsVo.getName());
-            modelDependency.setVersion(modelsVo.getVersion());
-            modelDependency.setParentModel(modelsVo.getParentModel());
-            modelDependency.setOwner(gitLinkUsername);
-            modelDependency.setMeta(meta);
-            modelDependency.setState(Constant.State_valid);
-            modelDependency1Dao.insert(modelDependency);
+//            modelDependency.setRepoId(gitlinIid);
+//            modelDependency.setIdentifier(repositoryName);
+//            modelDependency.setModelName(modelsVo.getName());
+//            modelDependency.setVersion(modelsVo.getVersion());
+//            modelDependency.setParentModel(modelsVo.getParentModel());
+//            modelDependency.setOwner(gitLinkUsername);
+//            modelDependency.setMeta(meta);
+//            modelDependency.setState(Constant.State_valid);
+//            modelDependency1Dao.insert(modelDependency);
 
             String s3Path = bucketName + "/mini-model-management-platform-files/" + relationPath;
 //            CompletableFuture.supplyAsync(() -> {
@@ -695,9 +687,6 @@ public class ModelsServiceImpl implements ModelsService {
 
     @Override
     public String newCreateVersion(ModelsVo modelsVo) throws Exception {
-        if ("master".equals(modelsVo.getVersion()) || "origin".equals(modelsVo.getVersion())) {
-            throw new Exception("不允许创建" + modelsVo.getVersion() + "分支");
-        }
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String ci4sUsername = loginUser.getUsername();
         String gitLinkUsername = loginUser.getSysUser().getUserName();

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java

@@ -97,9 +97,6 @@ public class NewDatasetServiceImpl implements NewDatasetService {
 
     @Override
     public String newCreateDataset(NewDatasetVo datasetVo) throws Exception {
-        if ("master".equals(datasetVo.getVersion()) || "origin".equals(datasetVo.getVersion())) {
-            throw new Exception("不允许创建" + datasetVo.getVersion() + "分支");
-        }
         String token = gitService.checkoutToken();
         Jedis jedis = new Jedis(redisHost, redisPort);
         LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -181,9 +178,6 @@ public class NewDatasetServiceImpl implements NewDatasetService {
     }
 
     public String newCreateVersion(NewDatasetVo datasetVo) throws Exception {
-        if ("master".equals(datasetVo.getVersion()) || "origin".equals(datasetVo.getVersion())) {
-            throw new Exception("不允许创建" + datasetVo.getVersion() + "分支");
-        }
         List<Map<String, Object>> versionList = getVersionList(datasetVo.getIdentifier(), datasetVo.getOwner());
         for (Map<String, Object> versionMap : versionList) {
             String version = (String) versionMap.get("name");