From 132ce8fdd9a3c58f6ec2c730958196bfcbf12011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com>
Date: Thu, 18 Jan 2024 15:40:12 +0800
Subject: [PATCH] =?UTF-8?q?argo=E6=9F=A5=E8=AF=A2=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E8=8A=82=E7=82=B9=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ExperimentInsServiceImpl.java  | 17 +++++++++++------
 .../ExperimentInsDaoMapper.xml                  |  5 ++++-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java
index a022cf12..ebec9473 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java
@@ -19,10 +19,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * (ExperimentIns)表服务实现类
@@ -262,11 +259,19 @@ public class ExperimentInsServiceImpl implements ExperimentInsService {
 
             // 解析nodes字段,提取节点状态并转换为JSON字符串
             Map<String, Object> nodes = (Map<String, Object>) status.get("nodes");
-
             if (nodes == null || nodes.isEmpty()) {
                 throw new RuntimeException("工作流的节点数据为空。");
             }
-            String nodeStatusJson = JsonUtils.mapToJson(nodes);
+
+            Map<String, Object> modifiedNodes =  new LinkedHashMap<>();
+
+            for (Map.Entry<String, Object> nodeEntry : nodes.entrySet()) {
+                Map<String,Object> nodeDetails = (Map<String, Object>) nodeEntry.getValue();
+                String templateName = (String) nodeDetails.get("templateName");
+                modifiedNodes.put(templateName, nodeDetails);
+            }
+
+            String nodeStatusJson = JsonUtils.mapToJson(modifiedNodes);
             experimentIns.setNodesStatus(nodeStatusJson);
             this.experimentInsDao.update(experimentIns);
 
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml
index 9a4462fb..a7db4ae7 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml
@@ -32,9 +32,12 @@
     <select id="getByExperimentId" resultMap="ExperimentInsMap">
         select id, experiment_id, argo_ins_name, argo_ins_ns, status, nodes_status, nodes_logs, start_time, finish_time, create_by, create_time, update_by, update_time, state
         from experiment_ins
-        where experiment_id = #{experiment_id} and state = 1 order by create_time limit 5
+        where experiment_id = #{experiment_id} and state = 1
+        order by create_time DESC
+        limit 5
     </select>
 
+
     <select id="queryByExperiment" resultMap="ExperimentInsMap">
         select
         id, experiment_id, argo_ins_name, argo_ins_ns, status, nodes_status, nodes_logs, start_time, finish_time, create_by, create_time, update_by, update_time, state