Browse Source

数据集列表接口修改

pull/7/head
西大锐 1 year ago
parent
commit
fec1b1a576
3 changed files with 7 additions and 13 deletions
  1. +1
    -2
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java
  2. +2
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java
  3. +4
    -10
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java

+ 1
- 2
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java View File

@@ -79,6 +79,7 @@ public class ModelsController {
return AjaxResult.success(this.modelsService.insert(models)); return AjaxResult.success(this.modelsService.insert(models));
} }



/** /**
* 新增数据 * 新增数据
* *
@@ -180,7 +181,5 @@ public class ModelsController {
} }






} }



+ 2
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java View File

@@ -9,6 +9,7 @@ import org.springframework.data.domain.PageRequest;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;


import java.util.List;
import java.util.Map; import java.util.Map;


/** /**
@@ -74,7 +75,7 @@ public interface DatasetService {


Map uploadDatasetPipeline(DatasetVersion datasetVersion) throws Exception; 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; String insertDatasetAndVersion(DatasetVo datasetVo) throws Exception;
public void checkDeclaredName(Dataset insert) throws Exception; public void checkDeclaredName(Dataset insert) throws Exception;


+ 4
- 10
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java View File

@@ -5,8 +5,6 @@ import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.platform.annotations.CheckDuplicate; import com.ruoyi.platform.annotations.CheckDuplicate;
import com.ruoyi.platform.domain.Dataset; import com.ruoyi.platform.domain.Dataset;
import com.ruoyi.platform.domain.DatasetVersion; 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.DatasetDao;
import com.ruoyi.platform.mapper.DatasetVersionDao; import com.ruoyi.platform.mapper.DatasetVersionDao;
import com.ruoyi.platform.service.DatasetService; 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.platform.vo.DatasetVo;
import com.ruoyi.system.api.model.LoginUser; import com.ruoyi.system.api.model.LoginUser;
import io.minio.MinioClient; import io.minio.MinioClient;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.InputStreamResource; import org.springframework.core.io.InputStreamResource;
@@ -37,10 +34,7 @@ import java.io.ByteArrayOutputStream;
import java.io.InputStream; 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.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;


/** /**
@@ -311,15 +305,15 @@ public class DatasetServiceImpl implements DatasetService {
} }


@Override @Override
public Map<String, List<DatasetVersion>> getDatasetVersions(Integer datasetId) throws Exception {
public List<DatasetVersion> getDatasetVersions(Integer datasetId) throws Exception {
// 获取所有相同模型ID的记录 // 获取所有相同模型ID的记录
List<DatasetVersion> versions = datasetVersionDao.queryByDatasetId(datasetId); List<DatasetVersion> versions = datasetVersionDao.queryByDatasetId(datasetId);


if (versions.isEmpty()) { if (versions.isEmpty()) {
throw new Exception("未找到相关数据集版本记录"); throw new Exception("未找到相关数据集版本记录");
} }
// 将结果按照版本分类
return versions.stream().collect(Collectors.groupingBy(DatasetVersion::getVersion));
return versions;
} }


@Override @Override


Loading…
Cancel
Save