From 9a7898df96b1895dabab9c7bfd20f98228c3a59b Mon Sep 17 00:00:00 2001
From: fans <1141904845@qq.com>
Date: Thu, 25 Jan 2024 15:41:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/experiment/ExperimentController.java       | 2 +-
 .../com/ruoyi/platform/service/ExperimentService.java     | 2 +-
 .../platform/service/impl/ExperimentServiceImpl.java      | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentController.java
index 29210880..d75d39e8 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentController.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentController.java
@@ -97,7 +97,7 @@ public class ExperimentController {
      */
     @DeleteMapping("{id}")
     @ApiOperation("删除流水线")
-    public AjaxResult deleteById(@PathVariable("id") Integer id) {
+    public AjaxResult deleteById(@PathVariable("id") Integer id) throws Exception {
         return  AjaxResult.success(this.experimentService.removeById(id));
     }
 
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ExperimentService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ExperimentService.java
index 9e3b8a63..c00b95a0 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ExperimentService.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ExperimentService.java
@@ -55,7 +55,7 @@ public interface ExperimentService {
      * @return 是否成功
      */
     boolean deleteById(Integer id);
-    String removeById(Integer id);
+    String removeById(Integer id) throws Exception;
     Experiment runExperiment(Integer id) throws Exception;
 
     Experiment addAndRunExperiment(Experiment experiment);
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java
index 68575d09..d5ac2dbb 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java
@@ -165,10 +165,10 @@ public class ExperimentServiceImpl implements ExperimentService {
     }
 
     @Override
-    public String removeById(Integer id) {
+    public String removeById(Integer id) throws Exception {
         Experiment experiment = experimentDao.queryById(id);
         if (experiment==null){
-            return "实验不存在";
+            throw new Exception("实验不存在");
         }
 
         //判断权限，只有admin和创建者本身可以删除该实验
@@ -176,12 +176,12 @@ public class ExperimentServiceImpl implements ExperimentService {
         String username = loginUser.getUsername();
         String createdBy = experiment.getCreateBy();
         if (!(StringUtils.equals(username,"admin") || StringUtils.equals(username,createdBy))){
-            return "无权限删除该实验";
+            throw new Exception("无权限删除该实验");
         }
 
         List<ExperimentIns> experimentInsList = experimentInsService.queryByExperimentId(experiment.getId());
         if (experimentInsList!=null&&experimentInsList.size()>0){
-            return "该实验存在实例，无法删除";
+            throw new Exception("该实验存在实例，无法删除");
         }
         experiment.setState(0);
         return this.experimentDao.update(experiment)>0?"删除成功":"删除失败";