| @@ -76,7 +76,7 @@ DatasetService { | |||||
| Map uploadDatasetPipeline(DatasetVersion datasetVersion) throws Exception; | Map uploadDatasetPipeline(DatasetVersion datasetVersion) throws Exception; | ||||
| List<DatasetVersion> getDatasetVersions(Integer datasetId) throws Exception; | |||||
| List<String> getDatasetVersions(Integer datasetId) throws Exception; | |||||
| String insertDatasetAndVersion(DatasetVo datasetVo) throws Exception; | String insertDatasetAndVersion(DatasetVo datasetVo) throws Exception; | ||||
| public void checkDeclaredName(Dataset insert) throws Exception; | public void checkDeclaredName(Dataset insert) throws Exception; | ||||
| @@ -75,7 +75,7 @@ public interface ModelsService { | |||||
| Map uploadModelsPipeline(ModelsVersion modelsVersion) throws Exception; | Map uploadModelsPipeline(ModelsVersion modelsVersion) throws Exception; | ||||
| ResponseEntity<InputStreamResource> downloadAllModelFiles(Integer modelsId, String version); | ResponseEntity<InputStreamResource> downloadAllModelFiles(Integer modelsId, String version); | ||||
| List<ModelsVersion> getModelVersions(Integer modelId) throws Exception; | |||||
| List<String> getModelVersions(Integer modelId) throws Exception; | |||||
| String insertModelAndVersion(ModelsVo modelsVo) throws Exception; | String insertModelAndVersion(ModelsVo modelsVo) throws Exception; | ||||
| @@ -36,6 +36,7 @@ import java.io.InputStream; | |||||
| import java.lang.reflect.Field; | import java.lang.reflect.Field; | ||||
| import java.text.SimpleDateFormat; | import java.text.SimpleDateFormat; | ||||
| import java.util.*; | import java.util.*; | ||||
| import java.util.stream.Collectors; | |||||
| /** | /** | ||||
| * (Dataset)表服务实现类 | * (Dataset)表服务实现类 | ||||
| @@ -307,7 +308,7 @@ public class DatasetServiceImpl implements DatasetService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public List<DatasetVersion> getDatasetVersions(Integer datasetId) throws Exception { | |||||
| public List<String> getDatasetVersions(Integer datasetId) throws Exception { | |||||
| // 获取所有相同模型ID的记录 | // 获取所有相同模型ID的记录 | ||||
| List<DatasetVersion> versions = datasetVersionDao.queryByDatasetId(datasetId); | List<DatasetVersion> versions = datasetVersionDao.queryByDatasetId(datasetId); | ||||
| @@ -315,9 +316,14 @@ public class DatasetServiceImpl implements DatasetService { | |||||
| throw new Exception("未找到相关数据集版本记录"); | throw new Exception("未找到相关数据集版本记录"); | ||||
| } | } | ||||
| return versions; | |||||
| // 使用Stream API提取version字段,并去重 | |||||
| return versions.stream() | |||||
| .map(DatasetVersion::getVersion) // 提取每个DatasetVersion对象的version属性 | |||||
| .distinct() // 去重 | |||||
| .collect(Collectors.toList()); // 收集到List中 | |||||
| } | } | ||||
| @Override | @Override | ||||
| @Transactional | @Transactional | ||||
| public String insertDatasetAndVersion(DatasetVo datasetVo) throws Exception { | public String insertDatasetAndVersion(DatasetVo datasetVo) throws Exception { | ||||
| @@ -1,6 +1,7 @@ | |||||
| package com.ruoyi.platform.service.impl; | package com.ruoyi.platform.service.impl; | ||||
| import com.ruoyi.common.security.utils.SecurityUtils; | import com.ruoyi.common.security.utils.SecurityUtils; | ||||
| import com.ruoyi.platform.domain.DatasetVersion; | |||||
| import com.ruoyi.platform.domain.Models; | import com.ruoyi.platform.domain.Models; | ||||
| import com.ruoyi.platform.domain.ModelsVersion; | import com.ruoyi.platform.domain.ModelsVersion; | ||||
| import com.ruoyi.platform.mapper.ModelsDao; | import com.ruoyi.platform.mapper.ModelsDao; | ||||
| @@ -353,7 +354,7 @@ public class ModelsServiceImpl implements ModelsService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public List<ModelsVersion> getModelVersions(Integer modelId) throws Exception { | |||||
| public List<String> getModelVersions(Integer modelId) throws Exception { | |||||
| // 获取所有相同模型ID的记录 | // 获取所有相同模型ID的记录 | ||||
| List<ModelsVersion> versions = modelsVersionDao.queryByModelsId(modelId); | List<ModelsVersion> versions = modelsVersionDao.queryByModelsId(modelId); | ||||
| @@ -362,7 +363,12 @@ public class ModelsServiceImpl implements ModelsService { | |||||
| } | } | ||||
| // // 将结果按照版本分类 | // // 将结果按照版本分类 | ||||
| // return versions.stream().collect(Collectors.groupingBy(ModelsVersion::getVersion)); | // return versions.stream().collect(Collectors.groupingBy(ModelsVersion::getVersion)); | ||||
| return versions; | |||||
| // 使用Stream API提取version字段,并去重 | |||||
| return versions.stream() | |||||
| .map(ModelsVersion::getVersion) // 提取每个ModelVersion对象的version属性 | |||||
| .distinct() // 去重 | |||||
| .collect(Collectors.toList()); // 收集到List中 | |||||
| } | } | ||||
| @Override | @Override | ||||