| @@ -1,5 +1,6 @@ | |||||
| package com.ruoyi.platform.service.impl; | package com.ruoyi.platform.service.impl; | ||||
| import com.alibaba.fastjson2.JSON; | |||||
| import com.ruoyi.common.core.utils.DateUtils; | import com.ruoyi.common.core.utils.DateUtils; | ||||
| import com.ruoyi.common.security.utils.SecurityUtils; | import com.ruoyi.common.security.utils.SecurityUtils; | ||||
| import com.ruoyi.platform.constant.Constant; | import com.ruoyi.platform.constant.Constant; | ||||
| @@ -11,6 +12,7 @@ import com.ruoyi.platform.service.GitService; | |||||
| import com.ruoyi.platform.service.NewDatasetService; | import com.ruoyi.platform.service.NewDatasetService; | ||||
| import com.ruoyi.platform.utils.*; | import com.ruoyi.platform.utils.*; | ||||
| import com.ruoyi.platform.vo.GitProjectVo; | import com.ruoyi.platform.vo.GitProjectVo; | ||||
| import com.ruoyi.platform.vo.ModelsVo; | |||||
| import com.ruoyi.platform.vo.NewDatasetVo; | import com.ruoyi.platform.vo.NewDatasetVo; | ||||
| import com.ruoyi.platform.vo.VersionVo; | import com.ruoyi.platform.vo.VersionVo; | ||||
| import com.ruoyi.system.api.model.LoginUser; | import com.ruoyi.system.api.model.LoginUser; | ||||
| @@ -324,7 +326,8 @@ public class NewDatasetServiceImpl implements NewDatasetService { | |||||
| List<Map<String, Object>> fileDetailsAfterGitPull = dvcUtils.getFileDetailsAfterGitPull(localPathlocal + loginUser.getUsername() + "/datasets/" + id, repo, version, "dataset", gitLinkUsername, gitLinkPassword); | List<Map<String, Object>> fileDetailsAfterGitPull = dvcUtils.getFileDetailsAfterGitPull(localPathlocal + loginUser.getUsername() + "/datasets/" + id, repo, version, "dataset", gitLinkUsername, gitLinkPassword); | ||||
| // 在localPathlocal+id+"/"+repositoryName目录下的dataset.yaml中取到元数据 | // 在localPathlocal+id+"/"+repositoryName目录下的dataset.yaml中取到元数据 | ||||
| Map<String, Object> stringObjectMap = YamlUtils.loadYamlFile(localPathlocal + loginUser.getUsername() + "/datasets/" + id + "/" + repo + "/" + "dataset.yaml"); | Map<String, Object> stringObjectMap = YamlUtils.loadYamlFile(localPathlocal + loginUser.getUsername() + "/datasets/" + id + "/" + repo + "/" + "dataset.yaml"); | ||||
| NewDatasetVo newDatasetVo = ConvertUtil.convertMapToObject(stringObjectMap, NewDatasetVo.class); | |||||
| String jsonString = JSON.toJSONString(stringObjectMap); | |||||
| NewDatasetVo newDatasetVo = JSON.parseObject(jsonString, NewDatasetVo.class); | |||||
| List<VersionVo> versionVos = new ArrayList<VersionVo>(); | List<VersionVo> versionVos = new ArrayList<VersionVo>(); | ||||
| if (fileDetailsAfterGitPull != null && fileDetailsAfterGitPull.size() > 0) { | if (fileDetailsAfterGitPull != null && fileDetailsAfterGitPull.size() > 0) { | ||||
| for (Map<String, Object> fileDetail : fileDetailsAfterGitPull) { | for (Map<String, Object> fileDetail : fileDetailsAfterGitPull) { | ||||