ci4s
/
ci4sManagement-cloud
41
0
Fork 1
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

修改删除报错接口

This commit is contained in:
fans 2024-01-25 15:41:41 +08:00
parent 35e40fdf0b
commit 9a7898df96
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentController.java
View File

@ -97,7 +97,7 @@ public class ExperimentController {
*/ */
@DeleteMapping("{id}") @DeleteMapping("{id}")
@ApiOperation("删除流水线") @ApiOperation("删除流水线")
public AjaxResult deleteById(@PathVariable("id") Integer id) { public AjaxResult deleteById(@PathVariable("id") Integer id) throws Exception {
return AjaxResult.success(this.experimentService.removeById(id)); return AjaxResult.success(this.experimentService.removeById(id));
} }

2
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ExperimentService.java
View File

@ -55,7 +55,7 @@ public interface ExperimentService {
* @return 是否成功 * @return 是否成功
*/ */
boolean deleteById(Integer id); boolean deleteById(Integer id);
String removeById(Integer id); String removeById(Integer id) throws Exception;
Experiment runExperiment(Integer id) throws Exception; Experiment runExperiment(Integer id) throws Exception;
Experiment addAndRunExperiment(Experiment experiment); Experiment addAndRunExperiment(Experiment experiment);

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

@ -165,10 +165,10 @@ public class ExperimentServiceImpl implements ExperimentService {
} }
@Override @Override
public String removeById(Integer id) { public String removeById(Integer id) throws Exception {
Experiment experiment = experimentDao.queryById(id); Experiment experiment = experimentDao.queryById(id);
if (experiment==null){ if (experiment==null){
return "实验不存在"; throw new Exception("实验不存在");
} }
//判断权限，只有admin和创建者本身可以删除该实验 //判断权限，只有admin和创建者本身可以删除该实验
@ -176,12 +176,12 @@ public class ExperimentServiceImpl implements ExperimentService {
String username = loginUser.getUsername(); String username = loginUser.getUsername();
String createdBy = experiment.getCreateBy(); String createdBy = experiment.getCreateBy();
if (!(StringUtils.equals(username,"admin") || StringUtils.equals(username,createdBy))){ if (!(StringUtils.equals(username,"admin") || StringUtils.equals(username,createdBy))){
return "无权限删除该实验"; throw new Exception("无权限删除该实验");
} }
List<ExperimentIns> experimentInsList = experimentInsService.queryByExperimentId(experiment.getId()); List<ExperimentIns> experimentInsList = experimentInsService.queryByExperimentId(experiment.getId());
if (experimentInsList!=null&&experimentInsList.size()>0){ if (experimentInsList!=null&&experimentInsList.size()>0){
return "该实验存在实例，无法删除"; throw new Exception("该实验存在实例，无法删除");
} }
experiment.setState(0); experiment.setState(0);
return this.experimentDao.update(experiment)>0?"删除成功":"删除失败"; return this.experimentDao.update(experiment)>0?"删除成功":"删除失败";