优化主动学习

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/activeLearn/ActiveLearnController.java

@@ -50,7 +50,7 @@ public class ActiveLearnController extends BaseController  {
 
     @DeleteMapping("{id}")
     @ApiOperation("删除主动学习")
-    public GenericsAjaxResult<String> deleteActiveLearn(@PathVariable("id") Long id) {
+    public GenericsAjaxResult<String> deleteActiveLearn(@PathVariable("id") Long id) throws Exception {
         return genericsSuccess(this.activeLearnService.delete(id));
     }
 

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/ray/RayController.java

@@ -50,7 +50,7 @@ public class RayController extends BaseController {
 
     @DeleteMapping("{id}")
     @ApiOperation("删除自动超参数寻优")
-        public GenericsAjaxResult<String> deleteRay(@PathVariable("id") Long id) {
+        public GenericsAjaxResult<String> deleteRay(@PathVariable("id") Long id) throws Exception {
         return genericsSuccess(this.rayService.delete(id));
     }
 

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ActiveLearnService.java

@@ -16,7 +16,7 @@ public interface ActiveLearnService {
 
     ActiveLearnVo getActiveLearnDetail(Long id) throws IOException;
 
-    String delete(Long id);
+    String delete(Long id) throws Exception;
 
     String runActiveLearnIns (Long id) throws Exception;
 }

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/RayService.java

@@ -16,7 +16,7 @@ public interface RayService {
 
     RayVo getRayDetail(Long id) throws IOException;
 
-    String delete(Long id);
+    String delete(Long id) throws Exception;
 
     String runRayIns(Long id) throws Exception;
 }

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ActiveLearnServiceImpl.java

@@ -117,15 +117,20 @@ public class ActiveLearnServiceImpl implements ActiveLearnService {
 
     @Override
     @Transactional
-    public String delete(Long id) {
+    public String delete(Long id) throws Exception {
         ActiveLearn activeLearn = activeLearnDao.getActiveLearnById(id);
         if (activeLearn == null) {
-            throw new RuntimeException("实验不存在");
+            throw new Exception("实验不存在");
         }
         String username = SecurityUtils.getLoginUser().getUsername();
         String createBy = activeLearn.getCreateBy();
         if (!(StringUtils.equals(username, "admin") || StringUtils.equals(username, createBy))) {
-            throw new RuntimeException("无权限删除该实验");
+            throw new Exception("无权限删除该实验");
+        }
+
+        List<ActiveLearnIns> insList = activeLearnInsDao.getByActiveLearnId(id);
+        if (!insList.isEmpty()) {
+            throw new Exception("该实验存在实例，无法删除");
         }
         activeLearn.setState(Constant.State_invalid);
         resourceOccupyService.deleteTaskState(Constant.TaskType_ActiveLearn, id, null);

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayServiceImpl.java

@@ -137,15 +137,19 @@ public class RayServiceImpl implements RayService {
 
     @Override
     @Transactional
-    public String delete(Long id) {
+    public String delete(Long id) throws Exception {
         Ray ray = rayDao.getRayById(id);
         if (ray == null) {
-            throw new RuntimeException("实验不存在");
+            throw new Exception("实验不存在");
         }
         String username = SecurityUtils.getLoginUser().getUsername();
         String createBy = ray.getCreateBy();
         if (!(StringUtils.equals(username, "admin") || StringUtils.equals(username, createBy))) {
-            throw new RuntimeException("无权限删除该实验");
+            throw new Exception("无权限删除该实验");
+        }
+        List<RayIns> insList = rayInsDao.getByRayId(id);
+        if (!insList.isEmpty()) {
+            throw new Exception("该实验存在实例，无法删除");
         }
         ray.setState(Constant.State_invalid);
         resourceOccupyService.deleteTaskState(Constant.TaskType_Ray, id, null);