From 23c2bb17706ceee1ce3879cc8031600bc96d5407 Mon Sep 17 00:00:00 2001 From: fanshuai <1141904845@qq.com> Date: Fri, 6 Sep 2024 17:11:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86LUJ?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/service/impl/NewDatasetServiceImpl.java | 11 ++++++++--- .../main/java/com/ruoyi/platform/utils/DVCUtils.java | 5 +++-- .../main/java/com/ruoyi/platform/vo/NewDatasetVo.java | 2 ++ 3 files changed, 13 insertions(+), 5 deletions(-) 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 c7126bb..dff6c6b 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 @@ -113,7 +113,9 @@ public class NewDatasetServiceImpl implements NewDatasetService { datasetVo.setIdentifier(repositoryName); datasetVo.setId(gitlinIid); datasetVo.setOwner((String) userInfo.get("login")); - + if (StringUtils.isEmpty(datasetVo.getDatasetSource())){ + datasetVo.setDatasetSource("用户上传"); + } YamlUtils.generateYamlFile(JsonUtils.objectToMap(datasetVo), localPath, "dataset"); // dvc init 初始化 DVCUtils.dvcInit(localPath); @@ -182,6 +184,9 @@ public class NewDatasetServiceImpl implements NewDatasetService { datasetVo.setIdentifier(repositoryName); datasetVo.setId(datasetVo.getId()); datasetVo.setOwner((String) userInfo.get("login")); + if (StringUtils.isEmpty(datasetVo.getDatasetSource())){ + datasetVo.setDatasetSource("用户上传"); + } YamlUtils.generateYamlFile(JsonUtils.objectToMap(datasetVo), localPath, "dataset"); // dvc init 初始化 @@ -269,9 +274,9 @@ public class NewDatasetServiceImpl implements NewDatasetService { version = (String) versionList.get(0).get("name"); } - List> fileDetailsAfterGitPull = DVCUtils.getFileDetailsAfterGitPull("E:\\test\\" +id, repositoryName, version, "data",gitLinkUsername, gitLinkPassword); + List> fileDetailsAfterGitPull = DVCUtils.getFileDetailsAfterGitPull(localPathlocal +id, repositoryName, version, "data",gitLinkUsername, gitLinkPassword); // 在localPathlocal+id+"/"+repositoryName目录下的dataset.yaml中取到元数据 - Map stringObjectMap = YamlUtils.loadYamlFile("E:\\test\\" + id + "\\" + repositoryName + "\\" + "dataset.yaml"); + Map stringObjectMap = YamlUtils.loadYamlFile(localPathlocal + id + "\\" + repositoryName + "\\" + "dataset.yaml"); NewDatasetVo newDatasetVo = ConvertUtil.convertMapToObject(stringObjectMap, NewDatasetVo.class); List versionVos = new ArrayList(); if (fileDetailsAfterGitPull!=null&&fileDetailsAfterGitPull.size()>0){ 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 ce84e86..c69f446 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 @@ -200,14 +200,15 @@ public class DVCUtils { // 切换到指定目录 Path repoPath = Paths.get(localPath, repoFolder, branch); - //刷新 + //刷新 TODO // gitFetch(localPath, username, password); // // 切换到指定分支 // gitCheckoutBranch(localPath, branch); // // 执行git pull // gitPull(localPath, username, password); // 读取data文件夹中的文件列表 - Path dataPath = Paths.get(repoPath.toString(), filePath); + String path = localPath + "\\" + repoFolder + "\\" + filePath; + Path dataPath = Paths.get(path); File[] files = dataPath.toFile().listFiles(); if (files != null) { diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/NewDatasetVo.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/NewDatasetVo.java index dddd325..6f182f0 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/NewDatasetVo.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/NewDatasetVo.java @@ -58,5 +58,7 @@ public class NewDatasetVo implements Serializable { private String processingCode; @ApiModelProperty(name = "owner",value = "项目所有者") private String owner; + @ApiModelProperty(name = "dataset_source",value = "数据集来源") + private String datasetSource; }