diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workflow/WorkflowController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workflow/WorkflowController.java index 4a4bb1e3..816247eb 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workflow/WorkflowController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workflow/WorkflowController.java @@ -129,7 +129,7 @@ public class WorkflowController { */ @DeleteMapping("{id}") @ApiOperation("删除流水线") - public AjaxResult deleteById(@PathVariable("id") Long id) { + public AjaxResult deleteById(@PathVariable("id") Long id) throws Exception { return AjaxResult.success(this.workflowService.removeById(id)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/WorkflowService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/WorkflowService.java index be6461c4..7520c562 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/WorkflowService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/WorkflowService.java @@ -52,7 +52,7 @@ public interface WorkflowService { * @return 是否成功 */ boolean deleteById(Long id); - String removeById(Long id); + String removeById(Long id) throws Exception; /** * 按流水线名字模糊分页查询 * diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java index 97f36d87..3b1be04c 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java @@ -107,7 +107,7 @@ public class WorkflowServiceImpl implements WorkflowService { return this.workflowDao.deleteById(id) > 0; } @Override - public String removeById(Long id) { + public String removeById(Long id) throws Exception { //先根据id提取出对应的流水线 Workflow workflow = workflowDao.queryById(id); @@ -116,16 +116,16 @@ public class WorkflowServiceImpl implements WorkflowService { String username = loginUser.getUsername(); String createdBy = workflow.getCreateBy(); if (!(StringUtils.equals(username,"admin") || StringUtils.equals(username,createdBy))){ - return "无权限删除该流水线"; + throw new Exception("无权限删除该流水线"); } if (workflow == null){ - return "流水线不存在"; + throw new Exception("流水线不存在"); } //判断这个流水线是否有相关实验存在 List experimentList = experimentService.queryByWorkflowId(id); if (experimentList!=null&&experimentList.size()>0){ - return "该流水线存在实验,无法删除"; + throw new Exception("该流水线存在实验,无法删除"); } workflow.setState(0); return this.workflowDao.update(workflow)>0?"删除成功":"删除失败"; @@ -143,7 +143,7 @@ public class WorkflowServiceImpl implements WorkflowService { Workflow workflow = this.queryById(id); if (workflow!= null) { Workflow duplicateWorkflow = new Workflow(); - duplicateWorkflow.setName(workflow.getName()); + duplicateWorkflow.setName(workflow.getName()+"-copy"); duplicateWorkflow.setDag(workflow.getDag()); duplicateWorkflow.setDescription(workflow.getDescription()); return this.insert(duplicateWorkflow);