手动解决冲突

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;
@@ -17,9 +15,7 @@ import com.ruoyi.platform.utils.MinioUtil;
 import com.ruoyi.platform.vo.DatasetVersionVo;
 import com.ruoyi.platform.vo.DatasetVo;
 import com.ruoyi.system.api.model.LoginUser;
-import io.minio.MinioClient;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -60,9 +56,6 @@ public class DatasetServiceImpl implements DatasetService {
     @Resource
     private DatasetVersionService datasetVersionService;
 
-
-    private MinioClient minioClient;
-
     // 固定存储桶名
     private final String bucketName = "platform-data";
 
@@ -207,7 +200,7 @@ public class DatasetServiceImpl implements DatasetService {
             e.printStackTrace();
             throw new Exception("下载数据集文件错误");
         }
-     }
+    }
 
     /**
      * 上传数据集
@@ -260,6 +253,7 @@ public class DatasetServiceImpl implements DatasetService {
 
     }
 
+
     @Override
     public Map uploadDatasetPipeline(DatasetVersion datasetVersion) throws Exception {
         String username = SecurityUtils.getLoginUser().getUsername();
@@ -309,6 +303,7 @@ public class DatasetServiceImpl implements DatasetService {
         // 使用Stream API提取version字段，并去重
         return versions.stream()
                 .map(DatasetVersion::getVersion) // 提取每个DatasetVersion对象的version属性
+                .filter(version -> version != null && !version.isEmpty()) //忽略null或空字符串的version
                 .distinct() // 去重
                 .collect(Collectors.toList()); // 收集到List中
     }