From 67b5a00a146063aa4924209a69f7f13556d55155 Mon Sep 17 00:00:00 2001 From: fans <1141904845@qq.com> Date: Mon, 8 Jan 2024 11:26:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=A0=E9=99=A4=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/platform/mapper/DatasetVersionDao.java | 1 + .../java/com/ruoyi/platform/mapper/ModelsVersionDao.java | 2 ++ .../ruoyi/platform/service/DatasetVersionService.java | 3 +++ .../com/ruoyi/platform/service/ModelsVersionService.java | 3 +++ .../ruoyi/platform/service/impl/DatasetServiceImpl.java | 5 ++++- .../platform/service/impl/DatasetVersionServiceImpl.java | 6 ++++++ .../ruoyi/platform/service/impl/ModelsServiceImpl.java | 7 ++++++- .../platform/service/impl/ModelsVersionServiceImpl.java | 6 ++++++ .../managementPlatform/DatasetVersionDaoMapper.xml | 9 +++++++-- .../mapper/managementPlatform/ModelsVersionDaoMapper.xml | 7 ++++++- 10 files changed, 44 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/DatasetVersionDao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/DatasetVersionDao.java index 0389be8..61d8d60 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/DatasetVersionDao.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/DatasetVersionDao.java @@ -80,5 +80,6 @@ public interface DatasetVersionDao { */ int deleteById(Integer id); + List queryByDatasetId(Integer datasetId); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ModelsVersionDao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ModelsVersionDao.java index 5d7e876..dbbf512 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ModelsVersionDao.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ModelsVersionDao.java @@ -80,5 +80,7 @@ public interface ModelsVersionDao { */ int deleteById(Integer id); + List queryByModelsId(Integer modelsId); + } 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 2c15b38..3c7bf07 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 @@ -7,6 +7,8 @@ import com.ruoyi.platform.domain.DatasetVersion; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import java.util.List; + /** * (DatasetVersion)表服务接口 * @@ -58,4 +60,5 @@ public interface DatasetVersionService { String removeById(Integer id); + List queryByDatasetId(Integer datasetId); } 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 a6086e1..b34fab1 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 @@ -7,6 +7,8 @@ import com.ruoyi.platform.domain.ModelsVersion; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import java.util.List; + /** * (ModelsVersion)表服务接口 * @@ -58,4 +60,5 @@ public interface ModelsVersionService { String removeById(Integer id); + List queryByModelsId(Integer modelsId); } 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 425992f..896e1a5 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 @@ -30,6 +30,7 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; /** * (Dataset)表服务实现类 @@ -42,7 +43,6 @@ public class DatasetServiceImpl implements DatasetService { @Resource private DatasetDao datasetDao; - private DatasetService datasetService; @Resource private DatasetVersionDao datasetVersionDao; @@ -158,6 +158,9 @@ public class DatasetServiceImpl implements DatasetService { if (!(StringUtils.equals(username,"admin") || StringUtils.equals(username,createdBy))){ return "无权限删除该数据集"; } + if (datasetVersionService.queryByDatasetId(id).size()>0){ + return "请先删除该数据集的版本文件"; + } dataset.setState(0); return this.datasetDao.update(dataset)>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 9cd7110..3bcbded 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 @@ -13,6 +13,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; +import java.util.List; /** * (DatasetVersion)表服务实现类 @@ -117,4 +118,9 @@ public class DatasetVersionServiceImpl implements DatasetVersionService { return this.datasetVersionDao.update(datasetVersion)>0?"删除数据集版本成功":"删除数据集版本失败"; } + @Override + public List queryByDatasetId(Integer datasetId) { + return datasetVersionDao.queryByDatasetId(datasetId); + } + } 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 e0ba230..377a9ed 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 @@ -6,6 +6,7 @@ import com.ruoyi.platform.domain.ModelsVersion; import com.ruoyi.platform.mapper.ModelsDao; import com.ruoyi.platform.mapper.ModelsVersionDao; import com.ruoyi.platform.service.ModelsService; +import com.ruoyi.platform.service.ModelsVersionService; import com.ruoyi.platform.utils.MinioUtil; import com.ruoyi.system.api.model.LoginUser; import io.minio.MinioClient; @@ -43,6 +44,8 @@ public class ModelsServiceImpl implements ModelsService { private ModelsVersionDao modelsVersionDao; private MinioClient minioClient; + @Resource + private ModelsVersionService modelsVersionService; @Value("${minio.endpoint}") private String minioEndpoint; @@ -148,7 +151,9 @@ public class ModelsServiceImpl implements ModelsService { if (!(StringUtils.equals(username,"admin") || StringUtils.equals(username,createdBy))){ return "无权限删除该模型"; } - + if (modelsVersionService.queryByModelsId(id).size()>0){ + return "请先删除该数据集的版本文件"; + } models.setState(0); return this.modelsDao.update(models)>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 be91ad3..22bb348 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 @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; +import java.util.List; /** * (ModelsVersion)表服务实现类 @@ -122,4 +123,9 @@ public class ModelsVersionServiceImpl implements ModelsVersionService { modelsVersion.setState(0); return this.modelsVersionDao.update(modelsVersion)>0?"删除成功":"删除失败"; } + + @Override + public List queryByModelsId(Integer modelsId){ + return modelsVersionDao.queryByModelsId(modelsId); + } } diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetVersionDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetVersionDaoMapper.xml index ca1a31b..f6eb60c 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetVersionDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetVersionDaoMapper.xml @@ -18,7 +18,12 @@ - + @@ -26,7 +31,7 @@ select id,dataset_id,version,url,file_name,file_size,available_cluster,status,create_by,create_time,update_by,update_time,state from dataset_version - where id = #{id} and state = 1 + where dataset_id = #{datasetId} and state = 1 diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsVersionDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsVersionDaoMapper.xml index c8a27a6..72a515b 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsVersionDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsVersionDaoMapper.xml @@ -16,7 +16,12 @@ - +