From 14ea5ad7a2681d54a6b159f09d46438c29f462d7 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 09:51:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=A8=A1=E5=9E=8Bid=E6=9F=A5?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=BF=94=E5=9B=9Elist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/platform/service/ModelsService.java | 2 +- .../platform/service/impl/DatasetVersionServiceImpl.java | 4 +--- .../com/ruoyi/platform/service/impl/ModelsServiceImpl.java | 7 ++++--- 3 files changed, 6 insertions(+), 7 deletions(-) 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 c8222649..ecd2dcd7 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); - Map 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/DatasetVersionServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java index fcf15068..4d7a81d5 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java @@ -150,9 +150,6 @@ public class DatasetVersionServiceImpl implements DatasetVersionService { } @Override - - - public void checkDeclaredVersion(DatasetVersion insert) throws Exception { DatasetVersion datasetVersion = datasetVersionDao.queryByDatasetVersion(insert); if (datasetVersion != null) { @@ -180,6 +177,7 @@ public class DatasetVersionServiceImpl implements DatasetVersionService { return "新增数据集版本失败: " + e.getMessage(); } + } private void insertPrepare(DatasetVersion datasetVersion) 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 a686795a..495918dc 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 @@ -353,15 +353,16 @@ public class ModelsServiceImpl implements ModelsService { } @Override - public Map> getModelVersions(Integer modelId) throws Exception { + public List getModelVersions(Integer modelId) throws Exception { // 获取所有相同模型ID的记录 List versions = modelsVersionDao.queryByModelsId(modelId); if (versions.isEmpty()) { throw new Exception("未找到相关模型版本记录"); } - // 将结果按照版本分类 - return versions.stream().collect(Collectors.groupingBy(ModelsVersion::getVersion)); +// // 将结果按照版本分类 +// return versions.stream().collect(Collectors.groupingBy(ModelsVersion::getVersion)); + return versions; } @Override