From aee258c3dfa2ce45129f7ef0fd5705dab8ce64b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Fri, 15 Mar 2024 11:20:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=8B=E6=8B=89=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=BF=94=E5=9B=9E=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/platform/service/DatasetService.java | 2 +- .../java/com/ruoyi/platform/service/ModelsService.java | 2 +- .../platform/service/impl/DatasetServiceImpl.java | 10 ++++++++-- .../ruoyi/platform/service/impl/ModelsServiceImpl.java | 10 ++++++++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java index 29539afa..3d77ae44 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java @@ -76,7 +76,7 @@ DatasetService { Map uploadDatasetPipeline(DatasetVersion datasetVersion) throws Exception; - List getDatasetVersions(Integer datasetId) throws Exception; + List getDatasetVersions(Integer datasetId) throws Exception; String insertDatasetAndVersion(DatasetVo datasetVo) throws Exception; public void checkDeclaredName(Dataset insert) throws Exception; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsService.java index ecd2dcd7..c1ad24fc 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsService.java @@ -75,7 +75,7 @@ public interface ModelsService { Map uploadModelsPipeline(ModelsVersion modelsVersion) throws Exception; ResponseEntity downloadAllModelFiles(Integer modelsId, String version); - List getModelVersions(Integer modelId) throws Exception; + List getModelVersions(Integer modelId) throws Exception; String insertModelAndVersion(ModelsVo modelsVo) throws Exception; 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 1fdc6d56..0efe3748 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 @@ -36,6 +36,7 @@ import java.io.InputStream; import java.lang.reflect.Field; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * (Dataset)表服务实现类 @@ -307,7 +308,7 @@ public class DatasetServiceImpl implements DatasetService { } @Override - public List getDatasetVersions(Integer datasetId) throws Exception { + public List getDatasetVersions(Integer datasetId) throws Exception { // 获取所有相同模型ID的记录 List versions = datasetVersionDao.queryByDatasetId(datasetId); @@ -315,9 +316,14 @@ public class DatasetServiceImpl implements DatasetService { throw new Exception("未找到相关数据集版本记录"); } - return versions; + // 使用Stream API提取version字段，并去重 + return versions.stream() + .map(DatasetVersion::getVersion) // 提取每个DatasetVersion对象的version属性 + .distinct() // 去重 + .collect(Collectors.toList()); // 收集到List中 } + @Override @Transactional public String insertDatasetAndVersion(DatasetVo datasetVo) throws Exception { 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 495918dc..30675fdf 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 @@ -1,6 +1,7 @@ package com.ruoyi.platform.service.impl; import com.ruoyi.common.security.utils.SecurityUtils; +import com.ruoyi.platform.domain.DatasetVersion; import com.ruoyi.platform.domain.Models; import com.ruoyi.platform.domain.ModelsVersion; import com.ruoyi.platform.mapper.ModelsDao; @@ -353,7 +354,7 @@ public class ModelsServiceImpl implements ModelsService { } @Override - public List getModelVersions(Integer modelId) throws Exception { + public List getModelVersions(Integer modelId) throws Exception { // 获取所有相同模型ID的记录 List versions = modelsVersionDao.queryByModelsId(modelId); @@ -362,7 +363,12 @@ public class ModelsServiceImpl implements ModelsService { } // // 将结果按照版本分类 // 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