Merge remote-tracking branch 'origin/dev' into dev

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java

@@ -94,13 +94,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;
 
     }

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);