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

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java

@@ -34,6 +34,7 @@ public class ExperimentInstanceStatusTask {
         // 首先查到所有非终止态的实验实例
         List<ExperimentIns> experimentInsList = experimentInsService.queryByExperimentIsNotTerminated();
         // 去argo查询状态
+        List<ExperimentIns> updateList = new ArrayList<>();
         if (experimentInsList != null && experimentInsList.size() > 0) {
             for (ExperimentIns experimentIns : experimentInsList) {
                 //当原本状态为null或非终止态时才调用argo接口
@@ -48,6 +49,10 @@ public class ExperimentInstanceStatusTask {
                 synchronized (experimentIds) {
                     experimentIds.add(experimentIns.getExperimentId());
                 }
+                updateList.add(experimentIns);
+            }
+            if (updateList.size() > 0) {
+                experimentInsDao.insertOrUpdateBatch(updateList);
             }
         }
     }

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

@@ -108,4 +108,6 @@ public interface ExperimentInsService {
     List<ExperimentIns> queryByExperimentIsNotTerminated();
 
     Map<String, Long> countByStatus();
+
+    void updateExperimentStatus(Integer experimentId);
 }

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

@@ -240,9 +240,13 @@ public class ExperimentInsServiceImpl implements ExperimentInsService {
             return "实验实例正在运行，不可删除";
         }
         experimentIns.setState(0);
-        updateExperimentStatus(experimentIns.getExperimentId());
-        return this.experimentInsDao.update(experimentIns) > 0 ? "删除成功" : "删除失败";
-
+        int update = this.experimentInsDao.update(experimentIns);
+        if (update > 0) {
+            updateExperimentStatus(experimentIns.getExperimentId());
+            return "删除成功";
+        } else {
+            return "删除失败";
+        }
     }
 
     @Override
@@ -422,6 +426,8 @@ public class ExperimentInsServiceImpl implements ExperimentInsService {
 
                 //删除数据集模型导出版本
                 deleteExportVersion(experimentIns);
+                //修改实验状态
+                updateExperimentStatus(experimentIns.getExperimentId());
 
                 return true;
             } else {
@@ -667,7 +673,7 @@ public class ExperimentInsServiceImpl implements ExperimentInsService {
         return flag;
     }
 
-    void updateExperimentStatus(Integer experimentId) {
+    public void updateExperimentStatus(Integer experimentId) {
         List<ExperimentIns> insList = getByExperimentId(experimentId);
         List<String> statusList = new ArrayList<>();
         // 更新实验状态列表

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

@@ -311,6 +311,7 @@ public class ExperimentServiceImpl implements ExperimentService {
         }
         List<ExperimentIns> updatedExperimentInsList = experimentInsService.getByExperimentId(id);
         experiment.setExperimentInsList(updatedExperimentInsList);
+        experimentInsService.updateExperimentStatus(id);
         return experiment;
     }