Browse Source

优化

pull/268/head
chenzhihang 8 months ago
parent
commit
cc98a699d4
5 changed files with 6 additions and 14 deletions
  1. +2
    -2
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java
  2. +1
    -3
      ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ActiveLearnDaoMapper.xml
  3. +1
    -3
      ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentDaoMapper.xml
  4. +1
    -3
      ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/MachineLearnDaoMapper.xml
  5. +1
    -3
      ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/RayDaoMapper.xml

+ 2
- 2
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java View File

@@ -240,7 +240,7 @@ public class ExperimentInsServiceImpl implements ExperimentInsService {
String username = loginUser.getUsername(); String username = loginUser.getUsername();
String createdBy = experimentIns.getCreateBy(); String createdBy = experimentIns.getCreateBy();
if (!(StringUtils.equals(username, "admin") || StringUtils.equals(username, createdBy))) { if (!(StringUtils.equals(username, "admin") || StringUtils.equals(username, createdBy))) {
throw new RuntimeException("无权限删除该流水线");
throw new RuntimeException("无权限删除该实验实例");
} }


if (StringUtils.isEmpty(experimentIns.getStatus())) { if (StringUtils.isEmpty(experimentIns.getStatus())) {
@@ -249,7 +249,7 @@ public class ExperimentInsServiceImpl implements ExperimentInsService {
if (StringUtils.equals(experimentIns.getStatus(), Constant.Running)) { if (StringUtils.equals(experimentIns.getStatus(), Constant.Running)) {
throw new RuntimeException("实验实例正在运行,不可删除"); throw new RuntimeException("实验实例正在运行,不可删除");
} }
experimentIns.setState(0);
experimentIns.setState(Constant.State_invalid);
int update = this.experimentInsDao.update(experimentIns); int update = this.experimentInsDao.update(experimentIns);
if (update > 0) { if (update > 0) {
resourceOccupyService.deleteTaskState(Constant.TaskType_Workflow, Long.valueOf(experimentIns.getExperimentId()), Long.valueOf(id)); resourceOccupyService.deleteTaskState(Constant.TaskType_Workflow, Long.valueOf(experimentIns.getExperimentId()), Long.valueOf(id));


+ 1
- 3
ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ActiveLearnDaoMapper.xml View File

@@ -130,12 +130,10 @@
<if test="activeLearn.updateBy != null and activeLearn.updateBy !=''"> <if test="activeLearn.updateBy != null and activeLearn.updateBy !=''">
update_by = #{activeLearn.updateBy}, update_by = #{activeLearn.updateBy},
</if> </if>
<if test="activeLearn.statusList != null and activeLearn.statusList !=''">
status_list = #{activeLearn.statusList},
</if>
<if test="activeLearn.state != null"> <if test="activeLearn.state != null">
state = #{activeLearn.state}, state = #{activeLearn.state},
</if> </if>
status_list = #{activeLearn.statusList},
</set> </set>
where id = #{activeLearn.id} where id = #{activeLearn.id}
</update> </update>


+ 1
- 3
ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentDaoMapper.xml View File

@@ -203,9 +203,6 @@
<if test="globalParam != null and globalParam != ''"> <if test="globalParam != null and globalParam != ''">
global_param = #{globalParam}, global_param = #{globalParam},
</if> </if>
<if test="statusList != null and statusList != ''">
status_list = #{statusList},
</if>
<if test="description != null and description != ''"> <if test="description != null and description != ''">
description = #{description}, description = #{description},
</if> </if>
@@ -224,6 +221,7 @@
<if test="state != null"> <if test="state != null">
state = #{state}, state = #{state},
</if> </if>
status_list = #{statusList},
</set> </set>
where id = #{id} where id = #{id}
</update> </update>


+ 1
- 3
ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/MachineLearnDaoMapper.xml View File

@@ -34,15 +34,13 @@
<if test="machineLearn.param != null and machineLearn.param !=''"> <if test="machineLearn.param != null and machineLearn.param !=''">
param = #{machineLearn.param}, param = #{machineLearn.param},
</if> </if>
<if test="machineLearn.statusList != null and machineLearn.statusList !=''">
status_list = #{machineLearn.statusList},
</if>
<if test="machineLearn.state != null"> <if test="machineLearn.state != null">
state = #{machineLearn.state}, state = #{machineLearn.state},
</if> </if>
<if test="machineLearn.updateBy != null and machineLearn.updateBy !=''"> <if test="machineLearn.updateBy != null and machineLearn.updateBy !=''">
update_by = #{machineLearn.updateBy}, update_by = #{machineLearn.updateBy},
</if> </if>
status_list = #{machineLearn.statusList},
</set> </set>
where id = #{machineLearn.id} where id = #{machineLearn.id}
</update> </update>


+ 1
- 3
ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/RayDaoMapper.xml View File

@@ -67,12 +67,10 @@
<if test="ray.updateBy != null and ray.updateBy !=''"> <if test="ray.updateBy != null and ray.updateBy !=''">
update_by = #{ray.updateBy}, update_by = #{ray.updateBy},
</if> </if>
<if test="ray.statusList != null and ray.statusList !=''">
status_list = #{ray.statusList},
</if>
<if test="ray.state != null"> <if test="ray.state != null">
state = #{ray.state}, state = #{ray.state},
</if> </if>
status_list = #{ray.statusList},
model = #{ray.model}, model = #{ray.model},
scheduler = #{ray.scheduler}, scheduler = #{ray.scheduler},
search_alg = #{ray.searchAlg}, search_alg = #{ray.searchAlg},


Loading…
Cancel
Save