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 431077b4..e4f78e13 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 @@ -988,7 +988,8 @@ public class ModelsServiceImpl implements ModelsService { ModelMetaVo modelMetaVo = JSON.parseObject(meta, ModelMetaVo.class); if (modelMetaVo.getParams() != null) { HashMap params = modelMetaVo.getParams(); - branch.putAll(params); + branch.put("params", params); + ArrayList params_names = new ArrayList<>(); for (String key : params.keySet()) { params_names.add(key); @@ -999,10 +1000,20 @@ public class ModelsServiceImpl implements ModelsService { HashMap metrics = modelMetaVo.getMetrics(); if (Constant.Type_Train.equals(type)) { Map trainMetrics = (Map) metrics.get(Constant.Type_Train); - branch.putAll(trainMetrics); + ArrayList metrics_names = new ArrayList<>(); + for (String key : trainMetrics.keySet()) { + metrics_names.add(key); + } + branch.put("metrics_names", metrics_names); + branch.put("metrics",trainMetrics); } else { Map evaluateMetrics = (Map) metrics.get(Constant.Type_Evaluate); - branch.putAll(evaluateMetrics); + ArrayList metrics_names = new ArrayList<>(); + for (String key : evaluateMetrics.keySet()) { + metrics_names.add(key); + } + branch.put("metrics_names", metrics_names); + branch.put("metrics",evaluateMetrics); } } } @@ -1017,7 +1028,7 @@ public class ModelsServiceImpl implements ModelsService { ModelDependency1 modelDependency1 = modelDependency1Dao.queryByRepoAndVersion(model.getRepoId(), model.getIdentifier(), model.getVersion()); ModelMetaVo modelMetaVo = JSON.parseObject(modelDependency1.getMeta(), ModelMetaVo.class); - HashMap metrics = modelMetaVo.getMetrics(); + HashMap metrics = modelMetaVo.getMetricsParams(); if (Constant.Type_Train.equals(type)) { batchMetrics.add(metrics.get("tarinDetail")); } else { @@ -1260,7 +1271,7 @@ public class ModelsServiceImpl implements ModelsService { } result.put("train", train); - result.put("tarinDetail", trainBatchMetrics); + metrics.put("tarinDetail", trainBatchMetrics); } @@ -1282,10 +1293,11 @@ public class ModelsServiceImpl implements ModelsService { } result.put("evaluate", evaluate); - result.put("evaluateDetail", evaluateBatchMetrics); + metrics.put("evaluateDetail", evaluateBatchMetrics); } modelMetaVo.setMetrics(result); + modelMetaVo.setMetricsParams(metrics); } }