ci4s
/
ci4sManagement-cloud
41
0
Fork 1
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

删除失败返回异常

This commit is contained in:
西大锐 2024-04-24 17:35:14 +08:00
parent c0ae1b1744
commit 3eadc4611d
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java
View File

@ -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;

2
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsService.java
View File

@ -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;

8
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java
View File

@ -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);

10
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
View File

@ -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?"删除成功":"删除失败";