From fec1b1a57638d57a1ec3875d2e6c435ed3bc825a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com>
Date: Tue, 12 Mar 2024 16:09:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/model/ModelsController.java         |  3 +--
 .../com/ruoyi/platform/service/DatasetService.java |  3 ++-
 .../platform/service/impl/DatasetServiceImpl.java  | 14 ++++----------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java
index afd1e9a5..821a4d7e 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java
@@ -79,6 +79,7 @@ public class ModelsController {
         return AjaxResult.success(this.modelsService.insert(models));
     }
 
+
     /**
      * 新增数据
      *
@@ -180,7 +181,5 @@ public class ModelsController {
     }
 
 
-
-
 }
 
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 7713f092..1f046fbc 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
@@ -9,6 +9,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -74,7 +75,7 @@ public interface DatasetService {
 
     Map uploadDatasetPipeline(DatasetVersion datasetVersion) throws Exception;
 
-    Map getDatasetVersions(Integer datasetId) throws Exception;
+    List<DatasetVersion> 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/impl/DatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java
index 0f43eee0..2a5304e1 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
@@ -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