|
|
|
@@ -5,8 +5,6 @@ import com.ruoyi.common.security.utils.SecurityUtils; |
|
|
|
import com.ruoyi.platform.annotations.CheckDuplicate; |
|
|
|
import com.ruoyi.platform.domain.Dataset; |
|
|
|
import com.ruoyi.platform.domain.DatasetVersion; |
|
|
|
import com.ruoyi.platform.domain.Models; |
|
|
|
import com.ruoyi.platform.domain.ModelsVersion; |
|
|
|
import com.ruoyi.platform.mapper.DatasetDao; |
|
|
|
import com.ruoyi.platform.mapper.DatasetVersionDao; |
|
|
|
import com.ruoyi.platform.service.DatasetService; |
|
|
|
@@ -16,7 +14,6 @@ import com.ruoyi.platform.utils.MinioUtil; |
|
|
|
import com.ruoyi.platform.vo.DatasetVo; |
|
|
|
import com.ruoyi.system.api.model.LoginUser; |
|
|
|
import io.minio.MinioClient; |
|
|
|
import io.swagger.annotations.ApiModelProperty; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.springframework.beans.factory.annotation.Value; |
|
|
|
import org.springframework.core.io.InputStreamResource; |
|
|
|
@@ -37,10 +34,7 @@ import java.io.ByteArrayOutputStream; |
|
|
|
import java.io.InputStream; |
|
|
|
import java.lang.reflect.Field; |
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.*; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
/** |
|
|
|
@@ -311,15 +305,15 @@ public class DatasetServiceImpl implements DatasetService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Map<String, List<DatasetVersion>> getDatasetVersions(Integer datasetId) throws Exception { |
|
|
|
public List<DatasetVersion> getDatasetVersions(Integer datasetId) throws Exception { |
|
|
|
// 获取所有相同模型ID的记录 |
|
|
|
List<DatasetVersion> versions = datasetVersionDao.queryByDatasetId(datasetId); |
|
|
|
|
|
|
|
if (versions.isEmpty()) { |
|
|
|
throw new Exception("未找到相关数据集版本记录"); |
|
|
|
} |
|
|
|
// 将结果按照版本分类 |
|
|
|
return versions.stream().collect(Collectors.groupingBy(DatasetVersion::getVersion)); |
|
|
|
|
|
|
|
return versions; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|