From 778df909bd0339cf63e903a31a8916b7d0d92b40 Mon Sep 17 00:00:00 2001 From: fanshuai <1141904845@qq.com> Date: Fri, 30 Aug 2024 13:57:55 +0800 Subject: [PATCH] dvc --- .../controller/dataset/NewDatasetFromGitController.java | 5 +++++ .../ruoyi/platform/service/impl/DatasetServiceImpl.java | 9 +++++++-- .../main/java/com/ruoyi/platform/vo/NewDatasetVo.java | 6 ++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/NewDatasetFromGitController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/NewDatasetFromGitController.java index 0821d3a..636154d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/NewDatasetFromGitController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/NewDatasetFromGitController.java @@ -107,4 +107,9 @@ public class NewDatasetFromGitController { } } + @GetMapping("/getdatasetDetail") + @ApiOperation(value = "获取数据集详情") + public AjaxResult getDatasetVersions(@PathVariable("datasetId") Integer datasetId) throws Exception { + return AjaxResult.success(this.datasetService.getDatasetVersions(datasetId)); + } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java index 9f59fbb..5528418 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java @@ -536,9 +536,11 @@ public class DatasetServiceImpl implements DatasetService { String userReq = jedis.get(ci4sUsername + "_gitUserInfo"); Map userInfo = JsonUtils.jsonToMap(userReq); // 创建分支 - String branchName = datasetVo.getVersion(); + String branchName = StringUtils.isEmpty(datasetVo.getVersion())? "master" : datasetVo.getVersion(); String repositoryName = datasetVo.getRepositoryName(); - gitService.createBranch(token, (String) userInfo.get("login"), repositoryName, branchName, "master"); + if (StringUtils.equals(branchName, "master")) { + gitService.createBranch(token, (String) userInfo.get("login"), repositoryName, branchName, "master"); + } // 得到项目地址 String projectUrl = gitendpoint + "/" +(String) userInfo.get("login") + "/" + repositoryName + ".git"; @@ -733,6 +735,9 @@ public class DatasetServiceImpl implements DatasetService { } }); } + + Map author = (Map) map.get("author"); + newDatasetVo.setCreateBy((String) author.get("name")); } } 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 7ea7276..3548c47 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 @@ -36,6 +36,8 @@ public class NewDatasetVo implements Serializable { private String timeAgo; @ApiModelProperty(name = "repo_id") private Integer repoId; - - + @ApiModelProperty(name = "visits") + private Integer visits; + @ApiModelProperty(name = "create_by") + private String createBy; }