diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelDependency1.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelDependency1.java index 387d6c92..b19e2a4a 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelDependency1.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelDependency1.java @@ -1,10 +1,12 @@ package com.ruoyi.platform.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; import lombok.Data; import java.io.Serializable; +import java.util.List; @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) @Data @@ -26,4 +28,7 @@ public class ModelDependency1 implements Serializable { private Integer state; private String meta; + + @TableField(exist = false) + private List metrics; } 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 ee82c9b0..bcada61b 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 @@ -1033,14 +1033,32 @@ public class ModelsServiceImpl implements ModelsService { public List queryVersionsMetrics(List params, String type) { List batchMetrics = new ArrayList<>(); for (ModelDependency1 model : params) { - ModelDependency1 modelDependency1 = modelDependency1Dao.queryByRepoAndVersion(model.getRepoId(), model.getIdentifier(), model.getVersion()); ModelMetaVo modelMetaVo = JSON.parseObject(modelDependency1.getMeta(), ModelMetaVo.class); HashMap metrics = modelMetaVo.getMetricsParams(); + List needMetrics = model.getMetrics(); + + ArrayList> result = new ArrayList<>(); if (Constant.Type_Train.equals(type)) { - batchMetrics.add(metrics.get("tarinDetail")); + List>> tarinDetail = (List>>) metrics.get("tarinDetail"); + List> trainMetrics = tarinDetail.get(0); + + for (Map trainMetric : trainMetrics) { + if (needMetrics.contains((String) trainMetric.get("name"))) { + result.add(trainMetric); + } + } + batchMetrics.add(result); } else { - batchMetrics.add(metrics.get("evaluateDetail")); + List>> evaluateDetail = (List>>) metrics.get("evaluateDetail"); + List> evaluateMetrics = evaluateDetail.get(0); + + for (Map trainMetric : evaluateMetrics) { + if (needMetrics.contains((String) trainMetric.get("name"))) { + result.add(trainMetric); + } + } + batchMetrics.add(result); } } return batchMetrics; @@ -1140,7 +1158,7 @@ public class ModelsServiceImpl implements ModelsService { String parentModel = JSON.toJSONString(map); modelDependency1Dao.deleteModelDependency(parentModel); dvcUtils.deleteDirectory(rootPath); - FileUtil.renameFile(rootPath, rootPath + "_deleted" + System.currentTimeMillis()); + FileUtil.renameFile(rootPath, rootPath + "_deleted_" + System.currentTimeMillis()); } public List convert(List> lst, String modelTopic, String modelTagName, String modelTypeName) { 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 94259c5f..aaf139dd 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 @@ -393,7 +393,7 @@ public class NewDatasetServiceImpl implements NewDatasetService { String rootPath = Paths.get(localPathlocal + "/" + relativePath).getParent().toString(); gitService.deleteBranch(token, owner, repo, version, rootPath); dvcUtils.deleteDirectory(rootPath); - FileUtil.renameFile(rootPath, rootPath + "_deleted"); + FileUtil.renameFile(rootPath, rootPath + "_deleted_" + System.currentTimeMillis()); } @Override