From 1ec6bec29d4ef45cfed087610d6086612ce2063c Mon Sep 17 00:00:00 2001
From: chenzhihang <709011834@qq.com>
Date: Mon, 21 Oct 2024 17:14:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E5=AE=9E=E4=BE=8B=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E8=BF=90=E8=A1=8C=E7=BB=93=E6=9D=9F=E5=90=8E=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=8C=87=E6=A0=87=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExperimentInstanceStatusTask.java         | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java
index eaf6ee12..64f43582 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java
@@ -49,28 +49,38 @@ public class ExperimentInstanceStatusTask {
                 //运行成功的实验实例记录指标数值
                 if (Constant.Succeeded.equals(experimentIns.getStatus())) {
                     Map<String, Object> metricRecord = JacksonUtil.parseJSONStr2Map(experimentIns.getMetricRecord());
-                    List<Map<String, Object>> trainMetricRecord = (List<Map<String, Object>>) metricRecord.get("train");
-                    List<Map<String, Object>> evaluateMetricRecord = (List<Map<String, Object>>) metricRecord.get("evaluate");
+                    List<Map<String, Object>> trainMetricRecords = (List<Map<String, Object>>) metricRecord.get("train");
+                    List<Map<String, Object>> evaluateMetricRecords = (List<Map<String, Object>>) metricRecord.get("evaluate");
 
                     HashMap<String, Object> metricValue = new HashMap<>();
                     HashMap<String, Object> trainMetricValue = new HashMap<>();
                     HashMap<String, Object> evaluateMetricValue = new HashMap<>();
 
-                    if (trainMetricRecord != null && !trainMetricRecord.isEmpty()) {
-                        String runId = (String) trainMetricRecord.get(0).get("run_id");
-                        List<InsMetricInfoVo> expTrainInfos = aimService.getExpTrainInfos1(true, experimentIns.getExperimentId(), runId);
-                        for (InsMetricInfoVo expTrainInfo : expTrainInfos) {
-                            Map metrics = expTrainInfo.getMetrics();
-                            trainMetricValue.putAll(metrics);
+                    if (trainMetricRecords != null && !trainMetricRecords.isEmpty()) {
+                        for (Map<String, Object> trainMetricRecord : trainMetricRecords) {
+                            String taskId = (String) trainMetricRecord.get("task_id");
+                            if (taskId.startsWith("model-export")) {
+                                String runId = (String) trainMetricRecord.get("run_id");
+                                List<InsMetricInfoVo> expTrainInfos = aimService.getExpTrainInfos1(true, experimentIns.getExperimentId(), runId);
+                                for (InsMetricInfoVo expTrainInfo : expTrainInfos) {
+                                    Map metrics = expTrainInfo.getMetrics();
+                                    trainMetricValue.putAll(metrics);
+                                }
+                            }
                         }
                     }
 
-                    if (evaluateMetricRecord != null && !evaluateMetricRecord.isEmpty()) {
-                        String runId = (String) evaluateMetricRecord.get(0).get("run_id");
-                        List<InsMetricInfoVo> expTrainInfos = aimService.getExpTrainInfos1(false, experimentIns.getExperimentId(), runId);
-                        for (InsMetricInfoVo expTrainInfo : expTrainInfos) {
-                            Map metrics = expTrainInfo.getMetrics();
-                            evaluateMetricValue.putAll(metrics);
+                    if (evaluateMetricRecords != null && !evaluateMetricRecords.isEmpty()) {
+                        for (Map<String, Object> evaluateMetricRecord : evaluateMetricRecords) {
+                            String taskId = (String) evaluateMetricRecord.get("task_id");
+                            if (taskId.startsWith("model-export")) {
+                                String runId = (String) evaluateMetricRecord.get("run_id");
+                                List<InsMetricInfoVo> expTrainInfos = aimService.getExpTrainInfos1(false, experimentIns.getExperimentId(), runId);
+                                for (InsMetricInfoVo expTrainInfo : expTrainInfos) {
+                                    Map metrics = expTrainInfo.getMetrics();
+                                    evaluateMetricValue.putAll(metrics);
+                                }
+                            }
                         }
                     }
                     metricValue.put("train", trainMetricValue);