From e66a74ba363f721f3d6fffc3a6365dd5e462bd20 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 11:36:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E5=AE=9E=E4=BE=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E7=8A=B6=E6=80=81=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=EF=BC=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E5=BA=94=E5=8F=8A=E6=97=B6=E8=BF=9B=E8=A1=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ExperimentInsServiceImpl.java     | 14 +++++++++-----
 .../service/impl/ExperimentServiceImpl.java        |  2 +-
 2 files changed, 10 insertions(+), 6 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 fa1eebf8..06b29b44 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
@@ -93,13 +93,17 @@ public class ExperimentInsServiceImpl implements ExperimentInsService {
     public List<ExperimentIns> getByExperimentId(Integer experimentId) {
         List<ExperimentIns> experimentInsList = experimentInsDao.getByExperimentId(experimentId);
         for (ExperimentIns experimentIns: experimentInsList) {
-            if (experimentIns!=null && StringUtils.isEmpty(experimentIns.getStatus())) {
-                Integer experimentInsId = experimentIns.getId();
-                String status = this.queryStatusFromArgo(experimentIns.getArgoInsNs(), experimentIns.getArgoInsName(),experimentInsId);
-                experimentIns.setStatus(status);
-                this.update(experimentIns);
+            if ( experimentIns!=null && (StringUtils.isEmpty(experimentIns.getStatus())) || StringUtils.equals(experimentIns.getStatus(), "Running") || StringUtils.equals(experimentIns.getStatus(),"Pending")) {
+//              //当原本状态为null或running或Pending时才调用argo接口
+                String newStatus = this.queryStatusFromArgo(experimentIns.getArgoInsNs(), experimentIns.getArgoInsName(),experimentIns.getId());
+                experimentIns.setStatus(newStatus);
+                //只有当新状态是终止态时才更新数据库
+                if (!(StringUtils.equals(newStatus, "Running") || StringUtils.equals(newStatus,"Pending"))) {
+                    this.update(experimentIns);
+                }
             }
         }
+
         return experimentInsList;
 
     }
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java
index bb2344d5..a8699a9b 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java
@@ -245,7 +245,7 @@ public class ExperimentServiceImpl implements ExperimentService {
             experimentIns.setArgoInsNs((String) metadata.get("namespace"));
             experimentIns.setArgoInsName((String) metadata.get("name"));
             //插入ExperimentIns表中
-            experimentInsDao.insert(experimentIns);
+            experimentInsService.insert(experimentIns);
 
         }catch (Exception e){
             throw new RuntimeException(e);