From 8050fbe811a2cf9822a0d27ee6ed57712d43144e Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Tue, 13 May 2025 09:14:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/ComponentController.java | 2 +- .../dataset/DatasetVersionController.java | 4 +- .../controller/icon/AssetIconController.java | 2 +- .../model/ModelDependencyController.java | 2 +- .../model/ModelsVersionController.java | 2 +- .../ComputingResourceController.java | 2 +- .../workflow/WorkflowParamController.java | 2 +- .../platform/service/AssetIconService.java | 2 +- .../platform/service/ComponentService.java | 2 +- .../service/ComputingResourceService.java | 2 +- .../service/DatasetVersionService.java | 4 +- .../service/ModelDependencyService.java | 2 +- .../service/ModelsVersionService.java | 2 +- .../service/WorkflowParamService.java | 2 +- .../service/impl/AssetIconServiceImpl.java | 6 +-- .../service/impl/CodeConfigServiceImpl.java | 2 +- .../service/impl/ComponentServiceImpl.java | 38 +++++++++---------- .../impl/ComputingResourceServiceImpl.java | 6 +-- .../impl/DatasetVersionServiceImpl.java | 8 ++-- .../impl/DevEnvironmentServiceImpl.java | 4 +- .../impl/ExperimentInsServiceImpl.java | 8 ++-- .../impl/ModelDependencyServiceImpl.java | 4 +- .../impl/ModelsVersionServiceImpl.java | 2 +- .../impl/WorkflowParamServiceImpl.java | 6 +-- 24 files changed, 58 insertions(+), 58 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java index a7fb7ec9..937bd7c9 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java @@ -100,7 +100,7 @@ public class ComponentController { */ @DeleteMapping("{id}") @ApiOperation("根据id删除组件") - public AjaxResult deleteById(@PathVariable("id") Integer id) { + public AjaxResult deleteById(@PathVariable("id") Integer id) throws Exception { return AjaxResult.success(this.componentService.removeById(id)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java index f6e7c6e5..beda603a 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java @@ -118,7 +118,7 @@ public class DatasetVersionController extends BaseController { */ @DeleteMapping({"{id}"}) @ApiOperation("删除数据集版本") - public GenericsAjaxResult deleteById(@PathVariable("id") Integer id) { + public GenericsAjaxResult deleteById(@PathVariable("id") Integer id) throws Exception { return genericsSuccess(this.datasetVersionService.removeById(id)); } @@ -132,7 +132,7 @@ public class DatasetVersionController extends BaseController { @DeleteMapping("/deleteVersion") @ApiOperation(value = "逻辑删除模型版本", notes = "根据数据集ID和版本逻辑删除模型版本记录。") public GenericsAjaxResult> deleteDatasetVersion(@RequestParam("dataset_id") Integer datasetId, - @RequestParam("version") String version) { + @RequestParam("version") String version) throws Exception { return genericsSuccess(this.datasetVersionService.deleteDatasetVersion(datasetId, version)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/icon/AssetIconController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/icon/AssetIconController.java index 0351dafc..c5b449a4 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/icon/AssetIconController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/icon/AssetIconController.java @@ -114,7 +114,7 @@ public class AssetIconController extends BaseController { */ @DeleteMapping("{id}") @ApiOperation("删除图标") - public GenericsAjaxResult deleteById(@PathVariable("id") Integer id) { + public GenericsAjaxResult deleteById(@PathVariable("id") Integer id) throws Exception { return genericsSuccess(this.assetIconService.removeById(id)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelDependencyController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelDependencyController.java index a62e8c61..f49e7df7 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelDependencyController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelDependencyController.java @@ -101,7 +101,7 @@ public class ModelDependencyController extends BaseController { */ @DeleteMapping("{id}") @ApiOperation("删除模型依赖") - public GenericsAjaxResult deleteById(@PathVariable("id") Integer id) { + public GenericsAjaxResult deleteById(@PathVariable("id") Integer id) throws Exception { return genericsSuccess(this.modelDependencyService.removeById(id)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java index 74a4ebf0..21104f05 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java @@ -130,7 +130,7 @@ public class ModelsVersionController extends BaseController { @DeleteMapping("/deleteVersion") @ApiOperation(value = "逻辑删除模型版本", notes = "根据模型ID和版本逻辑删除模型版本记录。") public GenericsAjaxResult> deleteModelsVersion(@RequestParam("models_id") Integer modelsId, - @RequestParam("version") String version) throws IOException { + @RequestParam("version") String version) throws Exception { return genericsSuccess(this.modelsVersionService.deleteModelsVersion(modelsId, version)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/resources/ComputingResourceController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/resources/ComputingResourceController.java index d7fd42ca..7753924e 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/resources/ComputingResourceController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/resources/ComputingResourceController.java @@ -94,7 +94,7 @@ public class ComputingResourceController extends BaseController { */ @DeleteMapping("{id}") @ApiOperation("删除计算资源") - public GenericsAjaxResult deleteById(@PathVariable("id") Integer id) { + public GenericsAjaxResult deleteById(@PathVariable("id") Integer id) throws Exception { return genericsSuccess(this.computingResourceService.removeById(id)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workflow/WorkflowParamController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workflow/WorkflowParamController.java index 8725334c..5c7c3831 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workflow/WorkflowParamController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workflow/WorkflowParamController.java @@ -84,7 +84,7 @@ public class WorkflowParamController extends BaseController { */ @DeleteMapping @ApiOperation("删除流水线参数") - public GenericsAjaxResult deleteById(Integer id) { + public GenericsAjaxResult deleteById(Integer id) throws Exception { return genericsSuccess(this.workflowParamService.removeById(id)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AssetIconService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AssetIconService.java index 7aa8a4ac..4fc1dbec 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AssetIconService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AssetIconService.java @@ -64,7 +64,7 @@ public interface AssetIconService { */ boolean deleteById(Integer id); - String removeById(Integer id); + String removeById(Integer id) throws Exception; List queryByName(String name); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ComponentService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ComponentService.java index 1f29c543..255c3475 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ComponentService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ComponentService.java @@ -57,7 +57,7 @@ public interface ComponentService { */ boolean deleteById(Integer id); - String removeById(Integer id); + String removeById(Integer id) throws Exception; List queryAllGroupedByCategory() throws Exception; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ComputingResourceService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ComputingResourceService.java index 781b304f..51f3bb0c 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ComputingResourceService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ComputingResourceService.java @@ -54,6 +54,6 @@ public interface ComputingResourceService { */ boolean deleteById(Integer id); - String removeById(Integer id); + String removeById(Integer id) throws Exception; } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetVersionService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetVersionService.java index 31ec8ba2..a3db0779 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetVersionService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetVersionService.java @@ -58,7 +58,7 @@ public interface DatasetVersionService { */ boolean deleteById(Integer id); - String removeById(Integer id); + String removeById(Integer id) throws Exception; List queryByDatasetId(Integer datasetId); @@ -66,7 +66,7 @@ public interface DatasetVersionService { Map queryByDatasetIdAndVersion(Integer datasetId, String version); - Map deleteDatasetVersion(Integer datasetId, String version); + Map deleteDatasetVersion(Integer datasetId, String version) throws Exception; void checkDeclaredVersion(DatasetVersion insert) throws Exception; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelDependencyService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelDependencyService.java index 049d87d1..c90bae79 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelDependencyService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelDependencyService.java @@ -57,7 +57,7 @@ public interface ModelDependencyService { */ boolean deleteById(Integer id); - String removeById(Integer id); + String removeById(Integer id) throws Exception; List queryByModelDependency(ModelDependency modelDependency) throws IOException; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsVersionService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsVersionService.java index 723bc745..f3626349 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsVersionService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsVersionService.java @@ -69,7 +69,7 @@ public interface ModelsVersionService { Map queryByModelsIdAndVersion(Integer modelsId, String version); - Map deleteModelsVersion(Integer modelsId, String version) throws IOException; + Map deleteModelsVersion(Integer modelsId, String version) throws Exception; String addModelVersions(List modelsVersions) throws Exception; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/WorkflowParamService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/WorkflowParamService.java index e20a7411..cf28c997 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/WorkflowParamService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/WorkflowParamService.java @@ -45,7 +45,7 @@ public interface WorkflowParamService { */ WorkflowParam update(WorkflowParam workflowParam); - String removeById(Integer id); + String removeById(Integer id) throws Exception; /** * 通过主键删除数据 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AssetIconServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AssetIconServiceImpl.java index 09610ce8..ed4be518 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AssetIconServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AssetIconServiceImpl.java @@ -101,10 +101,10 @@ public class AssetIconServiceImpl implements AssetIconService { } @Override - public String removeById(Integer id) { + public String removeById(Integer id) throws Exception { AssetIcon assetIcon = this.assetIconDao.queryById(id); if (assetIcon == null){ - return "图标不存在"; + throw new Exception("图标不存在"); } //判断权限，只有admin和创建者本身可以删除 @@ -114,7 +114,7 @@ public class AssetIconServiceImpl implements AssetIconService { String createdBy = assetIcon.getCreateBy(); if (!(StringUtils.equals(username,"admin") || StringUtils.equals(username,createdBy))){ - return "无权限删除该图标"; + throw new Exception("无权限删除该图标"); } assetIcon.setState(0); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/CodeConfigServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/CodeConfigServiceImpl.java index 872b34b9..63cda212 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/CodeConfigServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/CodeConfigServiceImpl.java @@ -121,7 +121,7 @@ public class CodeConfigServiceImpl implements CodeConfigService { String username = loginUser.getUsername(); String createBy = codeConfig.getCreateBy(); if (!(StringUtils.equals(username, "admin") || StringUtils.equals(username, createBy))) { - return "无权限删除该代码配置"; + throw new Exception("无权限删除该代码配置"); } codeConfig.setState(Constant.State_invalid); return this.codeConfigDao.update(codeConfig) > 0 ? "删除成功" : "删除失败"; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComponentServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComponentServiceImpl.java index a93628e3..d58694eb 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComponentServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComponentServiceImpl.java @@ -47,7 +47,7 @@ public class ComponentServiceImpl implements ComponentService { @Override public Component queryById(Integer id) { Component component = this.componentDao.queryById(id); - if (component == null){ + if (component == null) { throw new RuntimeException("组件不存在"); } @@ -58,14 +58,14 @@ public class ComponentServiceImpl implements ComponentService { public List queryAllGroupedByCategory() throws Exception { List componentList = this.componentDao.queryAll(); List result = new ArrayList<>(); - if (componentList.isEmpty()){ + if (componentList.isEmpty()) { return result; } List categoryTypeList = DictUtils.getDictCache("category_type"); - Map> groupedComponent = componentList.stream().collect(Collectors.groupingBy(Component::getCategoryId)); - for (Map.Entry > entry : groupedComponent.entrySet()) { + Map> groupedComponent = componentList.stream().collect(Collectors.groupingBy(Component::getCategoryId)); + for (Map.Entry> entry : groupedComponent.entrySet()) { List categorys = categoryTypeList.stream().filter(sysDictData -> StringUtils.equals(sysDictData.getDictValue(), String.valueOf(entry.getKey()))).collect(Collectors.toList()); - if (categorys.size() ==0){ + if (categorys.size() == 0) { throw new Exception("组件类型不存在"); } Map map = new HashMap(); @@ -80,8 +80,8 @@ public class ComponentServiceImpl implements ComponentService { /** * 分页查询 * - * @param component 筛选条件 - * @param pageRequest 分页对象 + * @param component 筛选条件 + * @param pageRequest 分页对象 * @return 查询结果 */ @Override @@ -104,7 +104,7 @@ public class ComponentServiceImpl implements ComponentService { component.setControlStrategy(controlStrategy); //json转换,存数据库 - String inParameters= gson.toJson(componentVo.getInParameters(), LinkedHashMap.class); + String inParameters = gson.toJson(componentVo.getInParameters(), LinkedHashMap.class); String outParameters = gson.toJson(componentVo.getOutParameters(), LinkedHashMap.class); String envVariable = gson.toJson(componentVo.getEnvVirables(), LinkedHashMap.class); component.setEnvVirables(envVariable); @@ -118,9 +118,9 @@ public class ComponentServiceImpl implements ComponentService { component.setState(1); // 检查相同category_id下的component_name是否已存在 - Integer existingCount = this.componentDao.countByNameAndCategoryId(component.getComponentName(),component.getCategoryId()); + Integer existingCount = this.componentDao.countByNameAndCategoryId(component.getComponentName(), component.getCategoryId()); - if(existingCount != null && existingCount > 0) { + if (existingCount != null && existingCount > 0) { throw new RuntimeException("该类别下已有同名组件"); } @@ -139,15 +139,15 @@ public class ComponentServiceImpl implements ComponentService { Component component = this.queryById(componentVo.getId()); //只能更新当前存在的组件 - if (component == null){ + if (component == null) { throw new RuntimeException("组件不存在，无法更新"); } //将object转成string类型 - component = ConvertUtil.entityToVo(componentVo,Component.class); + component = ConvertUtil.entityToVo(componentVo, Component.class); Gson gson = new Gson(); - String inParameters= gson.toJson(componentVo.getInParameters(), LinkedHashMap.class); + String inParameters = gson.toJson(componentVo.getInParameters(), LinkedHashMap.class); String outParameters = gson.toJson(componentVo.getOutParameters(), LinkedHashMap.class); String envVariable = gson.toJson(componentVo.getEnvVirables(), LinkedHashMap.class); @@ -174,24 +174,24 @@ public class ComponentServiceImpl implements ComponentService { } @Override - public String removeById(Integer id) { + public String removeById(Integer id) throws Exception { Component component = this.componentDao.queryById(id); //先进行判断 组件是否存在 - if (component == null ){ - return "组件不存在"; + if (component == null) { + throw new Exception("组件不存在"); } //判断权限，只有admin和创建者本身可以删除该组件 LoginUser loginUser = SecurityUtils.getLoginUser(); String username = loginUser.getUsername(); String createdBy = component.getCreateBy(); - if (!(StringUtils.equals(username,"admin") || StringUtils.equals(username,createdBy))){ - return "无权限删除该组件"; + if (!(StringUtils.equals(username, "admin") || StringUtils.equals(username, createdBy))) { + throw new Exception("无权限删除该组件"); } component.setState(0); - return this.componentDao.update(component)>0?"删除成功":"删除失败"; + return this.componentDao.update(component) > 0 ? "删除成功" : "删除失败"; } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComputingResourceServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComputingResourceServiceImpl.java index bf96b842..995460b9 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComputingResourceServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComputingResourceServiceImpl.java @@ -92,10 +92,10 @@ public class ComputingResourceServiceImpl implements ComputingResourceService { } @Override - public String removeById(Integer id) { + public String removeById(Integer id) throws Exception { ComputingResource computingResource = this.computingResourceDao.queryById(id); if (computingResource == null){ - return "计算资源不存在"; + throw new Exception("计算资源不存在"); } //判断权限，只有admin和创建者本身可以删除该数据集 @@ -103,7 +103,7 @@ public class ComputingResourceServiceImpl implements ComputingResourceService { String username = loginUser.getUsername(); String createdBy = computingResource.getCreateBy(); if (!(StringUtils.equals(username,"admin") || StringUtils.equals(username,createdBy))){ - return "无权限删除该计算资源"; + throw new Exception("无权限删除该计算资源"); } computingResource.setState(0); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java index d4e99abc..d0a4a01a 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java @@ -128,17 +128,17 @@ public class DatasetVersionServiceImpl implements DatasetVersionService { @Override - public String removeById(Integer id) { + public String removeById(Integer id) throws Exception { DatasetVersion datasetVersion = this.datasetVersionDao.queryById(id); if (datasetVersion == null){ - return "数据集版本信息不存在"; + throw new Exception("数据集版本信息不存在"); } //判断权限，只有admin和创建者本身可以删除该数据集版本信息 LoginUser loginUser = SecurityUtils.getLoginUser(); String username = loginUser.getUsername(); String createdBy = datasetVersion.getCreateBy(); if (!(StringUtils.equals(username,"admin") || StringUtils.equals(username,createdBy))){ - return "无权限删除该数据集版本"; + throw new Exception("无权限删除该数据集版本"); } datasetVersion.setState(0); @@ -175,7 +175,7 @@ public class DatasetVersionServiceImpl implements DatasetVersionService { } @Override - public Map deleteDatasetVersion(Integer datasetId, String version) { + public Map deleteDatasetVersion(Integer datasetId, String version) throws Exception { Map results = new HashMap(); // 根据模型ID和版本查询所有模型版本 List versions = this.datasetVersionDao.queryAllByDatasetVersion(datasetId, version); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DevEnvironmentServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DevEnvironmentServiceImpl.java index 82825cbe..f1cf1751 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DevEnvironmentServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DevEnvironmentServiceImpl.java @@ -154,7 +154,7 @@ public class DevEnvironmentServiceImpl implements DevEnvironmentService { public String removeById(Integer id) throws Exception { DevEnvironment devEnvironment = this.devEnvironmentDao.queryById(id); if (devEnvironment == null) { - return "开发环境信息不存在"; + throw new RuntimeException("开发环境信息不存在"); } //判断权限，只有admin和创建者本身可以删除该数据集 @@ -162,7 +162,7 @@ public class DevEnvironmentServiceImpl implements DevEnvironmentService { String username = loginUser.getUsername(); String createdBy = devEnvironment.getCreateBy(); if (!(StringUtils.equals(username, "admin") || StringUtils.equals(username, createdBy))) { - return "无权限删除该开发环境"; + throw new RuntimeException("无权限删除该开发环境"); } jupyterService.stopJupyterService(id); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java index 9a6ab793..f77dc0b6 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java @@ -213,7 +213,7 @@ public class ExperimentInsServiceImpl implements ExperimentInsService { public String removeById(Integer id) { ExperimentIns experimentIns = experimentInsDao.queryById(id); if (experimentIns == null) { - return "实验实例不存在"; + throw new RuntimeException("实验实例不存在"); } //判断权限，只有admin和创建者本身可以删除该实验实例 @@ -221,14 +221,14 @@ public class ExperimentInsServiceImpl implements ExperimentInsService { String username = loginUser.getUsername(); String createdBy = experimentIns.getCreateBy(); if (!(StringUtils.equals(username, "admin") || StringUtils.equals(username, createdBy))) { - return "无权限删除该流水线"; + throw new RuntimeException("无权限删除该流水线"); } if (StringUtils.isEmpty(experimentIns.getStatus())) { experimentIns = queryStatusFromArgo(experimentIns); } - if (StringUtils.equals(experimentIns.getStatus(), "Running")) { - return "实验实例正在运行，不可删除"; + if (StringUtils.equals(experimentIns.getStatus(), Constant.Running)) { + throw new RuntimeException("实验实例正在运行，不可删除"); } experimentIns.setState(0); int update = this.experimentInsDao.update(experimentIns); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java index 572a66a5..56e97245 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java @@ -245,7 +245,7 @@ public class ModelDependencyServiceImpl implements ModelDependencyService { } @Override - public String removeById(Integer id) { + public String removeById(Integer id) throws Exception { ModelDependency modelDependency = this.modelDependencyDao.queryById(id); if (modelDependency == null){ return "模型依赖信息不存在"; @@ -256,7 +256,7 @@ public class ModelDependencyServiceImpl implements ModelDependencyService { String username = loginUser.getUsername(); String createdBy = modelDependency.getCreateBy(); if (!(StringUtils.equals(username,"admin") || StringUtils.equals(username,createdBy))){ - return "无权限删除"; + throw new Exception("无权限删除"); } modelDependency.setState(0); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java index 24a6b636..ad81f1f5 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java @@ -194,7 +194,7 @@ public class ModelsVersionServiceImpl implements ModelsVersionService { } @Override - public Map deleteModelsVersion(Integer modelsId, String version) throws IOException { + public Map deleteModelsVersion(Integer modelsId, String version) throws Exception { Map results = new HashMap(); // 根据模型ID和版本查询所有模型版本 List versions = this.modelsVersionDao.queryAllByModelsVersion(modelsId, version); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowParamServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowParamServiceImpl.java index 69043477..21a178a9 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowParamServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowParamServiceImpl.java @@ -80,10 +80,10 @@ public class WorkflowParamServiceImpl implements WorkflowParamService { } @Override - public String removeById(Integer id) { + public String removeById(Integer id) throws Exception { WorkflowParam workflowParam = this.workflowParamDao.queryById(id); if (workflowParam == null){ - return "流水线参数不存在"; + throw new Exception("流水线参数不存在"); } //判断权限，只有admin和创建者本身可以删除 @@ -93,7 +93,7 @@ public class WorkflowParamServiceImpl implements WorkflowParamService { String createdBy = workflowParam.getCreateBy(); if (!(StringUtils.equals(username,"admin") || StringUtils.equals(username,createdBy))){ - return "无权限删除该流水线参数"; + throw new Exception("无权限删除该流水线参数"); } workflowParam.setState(0);