diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java index 913b02ec..7f94f7ca 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java @@ -675,10 +675,6 @@ public class ModelsServiceImpl implements ModelsService { String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername(); String gitLinkPassword = loginUser.getSysUser().getGitLinkPassword(); -// String ci4sUsername = "admin"; -// String gitLinkUsername = "fanshuai"; -// String gitLinkPassword = "h1n2x3j4y5@"; - Map userInfo = getUserInfo(ci4sUsername, gitLinkUsername, gitLinkPassword); String repositoryName = modelsVo.getIdentifier() == null ? ci4sUsername + "_model_" + DateUtils.dateTimeNow() : modelsVo.getIdentifier(); @@ -712,7 +708,7 @@ public class ModelsServiceImpl implements ModelsService { dvcUtils.dvcCheckout(rootPath); //干掉目标文件夹 dvcUtils.deleteDirectory(modelPath); - if (modelsVo.getModelVersionVos()!= null && modelsVo.getModelVersionVos().size() != 0) { + if (modelsVo.getModelVersionVos() != null && modelsVo.getModelVersionVos().size() != 0) { String sourcePath = modelsVo.getModelVersionVos().get(0).getUrl(); if (Constant.Source_Export.equals(modelsVo.getModelSource())) { @@ -750,6 +746,13 @@ public class ModelsServiceImpl implements ModelsService { YamlUtils.generateYamlFile(metaMap, metaPath, "metadata"); String meta = JSON.toJSONString(modelMetaVo); + //保存指标 + Map metrics = modelMetaVo.getMetrics(); + YamlUtils.generateYamlFile(metrics, rootPath, "metrics"); + //保存参数 + Map params = modelMetaVo.getParams(); + YamlUtils.generateYamlFile(params, rootPath, "params"); + //保存模型依赖 modelDependency.setRepoId(modelsVo.getId()); modelDependency.setIdentifier(repositoryName); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/YamlUtils.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/YamlUtils.java index f54238de..06973e15 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/YamlUtils.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/YamlUtils.java @@ -1,8 +1,10 @@ package com.ruoyi.platform.utils; +import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; import java.io.*; +import java.util.Iterator; import java.util.Map; public class YamlUtils { @@ -15,8 +17,10 @@ public class YamlUtils { * @param fileName 文件名 */ public static void generateYamlFile(Map data, String path, String fileName) { - Yaml yaml = new Yaml(); - + DumperOptions options = new DumperOptions(); + options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); + options.setPrettyFlow(true); + Yaml yaml = new Yaml(options); File directory = new File(path); if (!directory.exists()) { boolean isCreated = directory.mkdirs(); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelMetaVo.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelMetaVo.java index 589255f7..cbfdf760 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelMetaVo.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/ModelMetaVo.java @@ -54,10 +54,10 @@ public class ModelMetaVo implements Serializable { private List testDatasets; @ApiModelProperty(value = "参数") - private HashMap params; + private HashMap params; @ApiModelProperty(value = "指标") - private HashMap metrics; + private HashMap metrics; @ApiModelProperty(value = "训练任务") private TrainTaskDepency trainTask;