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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
西大锐 2024-01-08 11:29:51 +08:00
parent f871193523 67b5a00a14
commit b667c4b12f
10 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/DatasetVersionDao.java
View File

@ -80,5 +80,6 @@ public interface DatasetVersionDao {
*/
int deleteById(Integer id);
List<DatasetVersion> queryByDatasetId(Integer datasetId);
}

2
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ModelsVersionDao.java
View File

@ -80,5 +80,7 @@ public interface ModelsVersionDao {
*/
int deleteById(Integer id);
List<ModelsVersion> queryByModelsId(Integer modelsId);
}

3
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetVersionService.java
View File

@ -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<DatasetVersion> queryByDatasetId(Integer datasetId);
}

3
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsVersionService.java
View File

@ -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<ModelsVersion> queryByModelsId(Integer modelsId);
}

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

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

6
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java
View File

@ -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<DatasetVersion> queryByDatasetId(Integer datasetId) {
return datasetVersionDao.queryByDatasetId(datasetId);
}
}

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

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

6
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java
View File

@ -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<ModelsVersion> queryByModelsId(Integer modelsId){
return modelsVersionDao.queryByModelsId(modelsId);
}
}

9
ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetVersionDaoMapper.xml
View File

@ -18,7 +18,12 @@
<result property="state" column="state" jdbcType="INTEGER"/>
</resultMap>
<select id="queryByDatasetId" resultMap="DatasetVersionMap">
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
</select>
<!--查询单个-->
@ -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
</select>
<!--查询指定行数据-->

7
ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsVersionDaoMapper.xml
View File

@ -16,7 +16,12 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="state" column="state" jdbcType="INTEGER"/>
</resultMap>
<select id="queryByModelsId" resultMap="ModelsVersionMap">
select
id,models_id,version,url,file_name,file_size,status,create_by,create_time,update_by,update_time,state
from models_version
where models_id = #{modelsId} and state = 1
</select>
<!--查询单个-->
<select id="queryById" resultMap="ModelsVersionMap">
select