From 3eadc4611df28be4496690a56f5d64e719382e39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com>
Date: Wed, 24 Apr 2024 17:35:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=B1=E8=B4=A5=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/platform/service/DatasetService.java     |  2 +-
 .../java/com/ruoyi/platform/service/ModelsService.java |  2 +-
 .../platform/service/impl/DatasetServiceImpl.java      |  8 ++++----
 .../ruoyi/platform/service/impl/ModelsServiceImpl.java | 10 +++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java
index 1ab61c27..0f8cc707 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java
@@ -68,7 +68,7 @@ DatasetService {
      */
     boolean deleteById(Integer id);
 
-    String removeById(Integer id);
+    String removeById(Integer id) throws Exception;
 
     ResponseEntity<InputStreamResource> downloadDataset(Integer id) throws Exception;
 
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsService.java
index 71f94cb1..c2522728 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsService.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsService.java
@@ -64,7 +64,7 @@ public interface ModelsService {
      */
     boolean deleteById(Integer id);
 
-    String removeById(Integer id);
+    String removeById(Integer id) throws Exception;
 
     ResponseEntity<InputStreamResource> downloadModels(Integer id) throws Exception;
 
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java
index 1268fa27..c919b583 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java
@@ -160,10 +160,10 @@ public class DatasetServiceImpl implements DatasetService {
     }
 
     @Override
-    public String removeById(Integer id) {
+    public String removeById(Integer id) throws Exception {
         Dataset dataset = this.datasetDao.queryById(id);
         if (dataset == null){
-            return "数据集不存在";
+            throw new Exception("数据集不存在");
         }
 
         //判断权限，只有admin和创建者本身可以删除该数据集
@@ -171,10 +171,10 @@ public class DatasetServiceImpl implements DatasetService {
         String username = loginUser.getUsername();
         String createdBy = dataset.getCreateBy();
         if (!(StringUtils.equals(username,"admin") || StringUtils.equals(username,createdBy))){
-            return "无权限删除该数据集版本";
+            throw new Exception("无权限删除该数据集");
         }
         if (datasetVersionService.queryByDatasetId(id).size()>0){
-            return "请先删除该数据集的版本文件";
+            throw new Exception("请先删除该数据集下的版本文件");
         }
 
         dataset.setState(0);
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
index e3b65b1f..39ca7f31 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
@@ -150,23 +150,23 @@ public class ModelsServiceImpl implements ModelsService {
     }
 
     @Override
-    public String removeById(Integer id) {
+    public String removeById(Integer id) throws Exception {
         Models models = this.modelsDao.queryById(id);
         if (models == null){
-            return "模型不存在";
+            throw new Exception("模型不存在");
         }
 
-        //判断权限，只有admin和创建者本身可以删除该数据集
+        //判断权限，只有admin和创建者本身可以删除该模型
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String username = loginUser.getUsername();
 
 
         String createdBy = models.getCreateBy();
         if (!(StringUtils.equals(username,"admin") || StringUtils.equals(username,createdBy))){
-            return "无权限删除该模型";
+            throw new Exception("无权限删除该模型");
         }
         if (modelsVersionService.queryByModelsId(id).size()>0){
-            return "请先删除该模型的版本文件";
+            throw new Exception("请先删除该镜像下的版本文件");
         }
         models.setState(0);
         return this.modelsDao.update(models)>0?"删除成功":"删除失败";