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 77087726..e67e16a3 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 @@ -209,21 +209,6 @@ public class NewDatasetServiceImpl implements NewDatasetService { dvcUtils.moveFiles(sourcePath, datasetPath); } - if (!StringUtils.equals(datasetVo.getDatasetSource(), Constant.Source_Add)){ - // 准备数据 - DatasetTempStorage queryDatasetTempStorage = new DatasetTempStorage(); - queryDatasetTempStorage.setName(repositoryName); - queryDatasetTempStorage.setVersion(branchName); - DatasetTempStorage datasetTempStorage = datasetTempStorageService.queryByDatasetTempStorage(queryDatasetTempStorage); - if (datasetTempStorage != null){ - String source = datasetTempStorage.getSource(); - Map sourceMap = JacksonUtil.parseJSONStr2Map(source); - Map preprocessCode = (Map) sourceMap.get("preprocess_code"); - datasetVo.setProcessingCode(JacksonUtil.toJSONString(preprocessCode)); - sourceMap.remove("preprocess_code"); - datasetVo.setTrainTask(JacksonUtil.toJSONString(sourceMap)); - } - } // 拼接生产的元数据后写入yaml文件 datasetVo.setCreateBy(String.valueOf(StringUtils.isNotEmpty((String) userInfo.get("nickname")) ? userInfo.get("nickname") : userInfo.get("login"))); @@ -520,12 +505,12 @@ public class NewDatasetServiceImpl implements NewDatasetService { queryDatasetTempStorage.setVersion(datasetVo.getVersion()); DatasetTempStorage datasetTempStorage = datasetTempStorageService.queryByDatasetTempStorage(queryDatasetTempStorage); if (datasetTempStorage != null) { - String datasetSourceString = datasetTempStorage.getSource(); - Map datasetSourceMap = JacksonUtil.parseJSONStr2Map(datasetSourceString); - String preprocessCode = (String) datasetSourceMap.get("preprocess_code"); - datasetSourceMap.remove("preprocess_code"); + String source = datasetTempStorage.getSource(); + Map sourceMap = JacksonUtil.parseJSONStr2Map(source); + Map preprocessCode = (Map) sourceMap.get("preprocess_code"); datasetVo.setProcessingCode(preprocessCode); - datasetVo.setDatasetSource(JacksonUtil.toJSONString(datasetSourceMap)); + sourceMap.remove("preprocess_code"); + datasetVo.setTrainTask(sourceMap); datasetTempStorage.setState(0); datasetTempStorageService.update(datasetTempStorage); } 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 49e5a5ec..60cfff21 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 @@ -8,6 +8,7 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; import java.util.List; +import java.util.Map; @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) @Data @@ -55,9 +56,9 @@ public class NewDatasetVo implements Serializable { @ApiModelProperty(name = "update_time",value = "更新时间") private String updateTime; @ApiModelProperty(name = "processing_code",value = "处理代码") - private String processingCode; + private Map processingCode; @ApiModelProperty(name = "train_task",value = "训练任务") - private String trainTask; + private Map trainTask; @ApiModelProperty(name = "owner",value = "项目所有者") private String owner; @ApiModelProperty(name = "dataset_source",value = "数据集来源")