模型版本文件查询返回path,修改上传路径

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java

@@ -66,7 +66,7 @@ public class DatasetVersionController extends BaseController {
      */
     @GetMapping("/versions")
     @ApiOperation("通过数据集id和version查询版本文件列表")
-    public GenericsAjaxResult<List<DatasetVersion>> queryByDatasetIdAndVersion(@RequestParam("dataset_id") Integer datasetId,
+    public GenericsAjaxResult<Map<String,Object>> queryByDatasetIdAndVersion(@RequestParam("dataset_id") Integer datasetId,
                                                                                @RequestParam("version") String version) {
         return genericsSuccess(this.datasetVersionService.queryByDatasetIdAndVersion(datasetId, version));
     }

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java

@@ -64,7 +64,7 @@ public class ModelsVersionController extends BaseController {
      * @return 匹配的模型版本记录列表
      */
     @GetMapping("/versions")
-    public GenericsAjaxResult<List<ModelsVersion>> queryByModelsIdAndVersion(@RequestParam("models_id") Integer modelsId,
+    public GenericsAjaxResult<Map<String,Object>> queryByModelsIdAndVersion(@RequestParam("models_id") Integer modelsId,
                                                                              @RequestParam("version") String version) {
         return genericsSuccess(this.modelsVersionService.queryByModelsIdAndVersion(modelsId, version));
     }

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetVersionService.java

@@ -66,7 +66,7 @@ public interface DatasetVersionService {
 
     DatasetVersion queryByDatasetVersion(DatasetVersion datasetVersion);
 
-    List<DatasetVersion> queryByDatasetIdAndVersion(Integer datasetId, String version);
+    Map<String,Object> queryByDatasetIdAndVersion(Integer datasetId, String version);
 
     Map<Integer,String> deleteDatasetVersion(Integer datasetId, String version);
 

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsVersionService.java

@@ -66,7 +66,7 @@ public interface ModelsVersionService {
 
     ModelsVersion queryByModelsVersion(ModelsVersion modelsVersion);
 
-    List<ModelsVersion> queryByModelsIdAndVersion(Integer modelsId, String version);
+    Map<String,Object> queryByModelsIdAndVersion(Integer modelsId, String version);
 
     Map<Integer, String> deleteModelsVersion(Integer modelsId, String version);
 

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java

@@ -210,6 +210,9 @@ public class DatasetServiceImpl implements DatasetService {
     @Override
     public List<Map<String, String>> uploadDataset(MultipartFile[] files) throws Exception {
         List<Map<String, String>> results = new ArrayList<>();
+        //时间戳统一定在外面，一次上传就定好
+        Date createTime = new Date();
+        String timestamp = new SimpleDateFormat("yyyyMMdd-HHmmss").format(createTime);
 
         for (MultipartFile file:files){
             if (file.isEmpty()) {
@@ -222,8 +225,6 @@ public class DatasetServiceImpl implements DatasetService {
             // 其余操作基于 modelsVersionToUse
             String username = SecurityUtils.getLoginUser().getUsername();
             String fileName = file.getOriginalFilename();
-            Date createTime = new Date();
-            String timestamp = new SimpleDateFormat("yyyyMMdd-HHmmss").format(createTime);
             String objectName = "datasets/" + username + "/" + timestamp + "/" + fileName;
 
             // 上传文件到MinIO并将记录新增到数据库中

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java

@@ -33,6 +33,9 @@ public class DatasetVersionServiceImpl implements DatasetVersionService {
     @Resource
     private DatasetVersionDao datasetVersionDao;
 
+    // 固定存储桶名
+    private final String bucketName = "platform-data";
+
     /**
      * 通过ID查询单条数据
      *
@@ -131,9 +134,21 @@ public class DatasetVersionServiceImpl implements DatasetVersionService {
     }
 
     @Override
+    public Map<String,Object> queryByDatasetIdAndVersion(Integer datasetId, String version) {
+        Map<String, Object> response = new HashMap<>();
+
+        List<DatasetVersion> datasetVersionList = this.datasetVersionDao.queryAllByDatasetVersion(datasetId, version);
+        datasetVersionList.stream().
+                findFirst().
+                ifPresent(datasetVersion -> {
+                    String url = datasetVersion.getUrl();
+                    String path = bucketName + '/' + url.substring(0, url.lastIndexOf('/'));
+                    response.put("path", path);
+
+                });
 
-    public List<DatasetVersion> queryByDatasetIdAndVersion(Integer datasetId, String version) {
-        return this.datasetVersionDao.queryAllByDatasetVersion(datasetId, version);
+        response.put("content", datasetVersionList);
+        return response;
     }
 
     @Override

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java

@@ -205,6 +205,9 @@ public class ModelsServiceImpl implements ModelsService {
     public List<Map<String, String>> uploadModels(MultipartFile[] files) throws Exception {
 
         List<Map<String, String>> results = new ArrayList<>();
+        //时间戳统一定在外面，一次上传就定好
+        Date createTime = new Date();
+        String timestamp = new SimpleDateFormat("yyyyMMdd-HHmmss").format(createTime);
 
         for (MultipartFile file:files){
             if (file.isEmpty()) {
@@ -217,8 +220,6 @@ public class ModelsServiceImpl implements ModelsService {
             // 其余操作基于 modelsVersionToUse
             String username = SecurityUtils.getLoginUser().getUsername();
             String fileName = file.getOriginalFilename();
-            Date createTime = new Date();
-            String timestamp = new SimpleDateFormat("yyyyMMdd-HHmmss").format(createTime);
             String objectName = "models/" + username + "/" + timestamp + "/" + fileName;
 
             // 上传文件到MinIO并将记录新增到数据库中

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java

@@ -34,6 +34,9 @@ public class ModelsVersionServiceImpl implements ModelsVersionService {
     @Resource
     private ModelsDao modelsDao;
 
+    // 固定存储桶名
+    private final String bucketName = "platform-data";
+
     /**
      * 通过ID查询单条数据
      *
@@ -159,8 +162,21 @@ public class ModelsVersionServiceImpl implements ModelsVersionService {
      * @return 新的模型版本记录列表
      */
     @Override
-    public List<ModelsVersion> queryByModelsIdAndVersion(Integer modelsId, String version) {
-        return this.modelsVersionDao.queryAllByModelsVersion(modelsId, version) ;
+    public Map<String,Object> queryByModelsIdAndVersion(Integer modelsId, String version) {
+        Map<String,Object> response = new HashMap<>();
+
+        List<ModelsVersion> modelsVersionList = this.modelsVersionDao.queryAllByModelsVersion(modelsId, version);
+        modelsVersionList.stream().
+                findFirst().
+                ifPresent(modelsVersion -> {
+                    String url = modelsVersion.getUrl();
+                    String path = bucketName + '/' + url.substring(0, url.lastIndexOf('/'));
+                    response.put("path", path);
+
+                });
+
+        response.put("content", modelsVersionList);
+        return response;
 
     }