dvc
This commit is contained in:
parent
df87d16d8f
commit
778df909bd
|
@ -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));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -536,9 +536,11 @@ public class DatasetServiceImpl implements DatasetService {
|
||||||
String userReq = jedis.get(ci4sUsername + "_gitUserInfo");
|
String userReq = jedis.get(ci4sUsername + "_gitUserInfo");
|
||||||
Map<String, Object> userInfo = JsonUtils.jsonToMap(userReq);
|
Map<String, Object> userInfo = JsonUtils.jsonToMap(userReq);
|
||||||
// 创建分支
|
// 创建分支
|
||||||
String branchName = datasetVo.getVersion();
|
String branchName = StringUtils.isEmpty(datasetVo.getVersion())? "master" : datasetVo.getVersion();
|
||||||
String repositoryName = datasetVo.getRepositoryName();
|
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";
|
String projectUrl = gitendpoint + "/" +(String) userInfo.get("login") + "/" + repositoryName + ".git";
|
||||||
|
|
||||||
|
@ -733,6 +735,9 @@ public class DatasetServiceImpl implements DatasetService {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Map<String, Object> author = (Map<String, Object>) map.get("author");
|
||||||
|
newDatasetVo.setCreateBy((String) author.get("name"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -36,6 +36,8 @@ public class NewDatasetVo implements Serializable {
|
||||||
private String timeAgo;
|
private String timeAgo;
|
||||||
@ApiModelProperty(name = "repo_id")
|
@ApiModelProperty(name = "repo_id")
|
||||||
private Integer repoId;
|
private Integer repoId;
|
||||||
|
@ApiModelProperty(name = "visits")
|
||||||
|
private Integer visits;
|
||||||
|
@ApiModelProperty(name = "create_by")
|
||||||
|
private String createBy;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue