From cc98a699d484020b633b2cc7ef336405d8f8b15a Mon Sep 17 00:00:00 2001
From: chenzhihang <709011834@qq.com>
Date: Fri, 23 May 2025 14:43:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/platform/service/impl/ExperimentInsServiceImpl.java | 4 ++--
 .../mapper/managementPlatform/ActiveLearnDaoMapper.xml        | 4 +---
 .../mapper/managementPlatform/ExperimentDaoMapper.xml         | 4 +---
 .../mapper/managementPlatform/MachineLearnDaoMapper.xml       | 4 +---
 .../main/resources/mapper/managementPlatform/RayDaoMapper.xml | 4 +---
 5 files changed, 6 insertions(+), 14 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 de1edb30..a8a0bf21 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
@@ -240,7 +240,7 @@ public class ExperimentInsServiceImpl implements ExperimentInsService {
         String username = loginUser.getUsername();
         String createdBy = experimentIns.getCreateBy();
         if (!(StringUtils.equals(username, "admin") || StringUtils.equals(username, createdBy))) {
-            throw new RuntimeException("无权限删除该流水线");
+            throw new RuntimeException("无权限删除该实验实例");
         }
 
         if (StringUtils.isEmpty(experimentIns.getStatus())) {
@@ -249,7 +249,7 @@ public class ExperimentInsServiceImpl implements ExperimentInsService {
         if (StringUtils.equals(experimentIns.getStatus(), Constant.Running)) {
             throw new RuntimeException("实验实例正在运行，不可删除");
         }
-        experimentIns.setState(0);
+        experimentIns.setState(Constant.State_invalid);
         int update = this.experimentInsDao.update(experimentIns);
         if (update > 0) {
             resourceOccupyService.deleteTaskState(Constant.TaskType_Workflow, Long.valueOf(experimentIns.getExperimentId()), Long.valueOf(id));
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ActiveLearnDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ActiveLearnDaoMapper.xml
index 3ec64afd..a73bdd16 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ActiveLearnDaoMapper.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ActiveLearnDaoMapper.xml
@@ -130,12 +130,10 @@
             <if test="activeLearn.updateBy != null and activeLearn.updateBy !=''">
                 update_by = #{activeLearn.updateBy},
             </if>
-            <if test="activeLearn.statusList != null and activeLearn.statusList !=''">
-                status_list = #{activeLearn.statusList},
-            </if>
             <if test="activeLearn.state != null">
                 state = #{activeLearn.state},
             </if>
+            status_list = #{activeLearn.statusList},
         </set>
         where id = #{activeLearn.id}
     </update>
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentDaoMapper.xml
index 99ee248a..011dcf08 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentDaoMapper.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentDaoMapper.xml
@@ -203,9 +203,6 @@
             <if test="globalParam != null and globalParam != ''">
                 global_param = #{globalParam},
             </if>
-            <if test="statusList != null and statusList != ''">
-                status_list = #{statusList},
-            </if>
             <if test="description != null and description != ''">
                 description = #{description},
             </if>
@@ -224,6 +221,7 @@
             <if test="state != null">
                 state = #{state},
             </if>
+            status_list = #{statusList},
         </set>
         where id = #{id}
     </update>
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/MachineLearnDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/MachineLearnDaoMapper.xml
index 8f5cfe49..2ceb5c1f 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/MachineLearnDaoMapper.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/MachineLearnDaoMapper.xml
@@ -34,15 +34,13 @@
             <if test="machineLearn.param != null and machineLearn.param !=''">
                 param = #{machineLearn.param},
             </if>
-            <if test="machineLearn.statusList != null and machineLearn.statusList !=''">
-                status_list = #{machineLearn.statusList},
-            </if>
             <if test="machineLearn.state != null">
                 state = #{machineLearn.state},
             </if>
             <if test="machineLearn.updateBy != null and machineLearn.updateBy !=''">
                 update_by = #{machineLearn.updateBy},
             </if>
+            status_list = #{machineLearn.statusList},
         </set>
         where id = #{machineLearn.id}
     </update>
diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/RayDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/RayDaoMapper.xml
index 035cbf4e..f2639960 100644
--- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/RayDaoMapper.xml
+++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/RayDaoMapper.xml
@@ -67,12 +67,10 @@
             <if test="ray.updateBy != null and ray.updateBy !=''">
                 update_by = #{ray.updateBy},
             </if>
-            <if test="ray.statusList != null and ray.statusList !=''">
-                status_list = #{ray.statusList},
-            </if>
             <if test="ray.state != null">
                 state = #{ray.state},
             </if>
+            status_list = #{ray.statusList},
             model = #{ray.model},
             scheduler = #{ray.scheduler},
             search_alg = #{ray.searchAlg},