修改公开模型数据集路径测试

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

@@ -72,7 +72,7 @@ public class NewDatasetFromGitController {
     @PostMapping("/queryNextVersion")
     @ApiOperation("查询最新版本")
     public AjaxResult queryNextVersion(@RequestBody NewDatasetVo datasetVo) throws Exception {
-        return AjaxResult.success("查询成功",this.newDatasetService.getNextVersion(datasetVo));
+        return AjaxResult.success("查询成功", this.newDatasetService.getNextVersion(datasetVo));
 
     }
 
@@ -111,7 +111,7 @@ public class NewDatasetFromGitController {
         dataset.setDataType(dataType);
         dataset.setName(name);
         if (isPublic) {
-            return AjaxResult.success(this.newDatasetService.newPubilcQueryByPage(dataset, pageRequest,null));
+            return AjaxResult.success(this.newDatasetService.newPubilcQueryByPage(dataset, pageRequest, null));
         } else {
             return AjaxResult.success(this.newDatasetService.newPersonalQueryByPage(dataset, pageRequest));
         }
@@ -176,8 +176,8 @@ public class NewDatasetFromGitController {
      */
     @GetMapping("/downloadAllFiles")
     @ApiOperation(value = "下载同一版本下所有数据集，并打包")
-    public ResponseEntity<InputStreamResource> downloadAllDatasetFiles(@RequestParam("name") String name, @RequestParam("identifier") String identifier, @RequestParam("id") Integer id, @RequestParam("version") String version, @RequestParam("is_public") Boolean isPublic) throws Exception {
-        return newDatasetService.downloadAllDatasetFilesNew(name, identifier, id, version, isPublic);
+    public ResponseEntity<InputStreamResource> downloadAllDatasetFiles(@RequestParam("name") String name, @RequestParam("identifier") String identifier, @RequestParam("id") Integer id, @RequestParam("owner") String owner, @RequestParam("version") String version, @RequestParam("is_public") Boolean isPublic) throws Exception {
+        return newDatasetService.downloadAllDatasetFilesNew(name, identifier, id, owner, version, isPublic);
     }
 
     /**

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

@@ -68,8 +68,8 @@ public class NewModelFromGitController extends BaseController {
 
     @GetMapping("/downloadAllFiles")
     @ApiOperation(value = "下载同一版本下所有模型，并打包")
-    public ResponseEntity<InputStreamResource> downloadAllDatasetFiles(@RequestParam("name") String name, @RequestParam("identifier") String identifier, @RequestParam("id") Integer id, @RequestParam("version") String version, @RequestParam("is_public") Boolean isPublic) throws Exception {
-        return modelsService.downloadAllModelFilesNew(name, identifier, id, version, isPublic);
+    public ResponseEntity<InputStreamResource> downloadAllDatasetFiles(@RequestParam("name") String name, @RequestParam("identifier") String identifier, @RequestParam("id") Integer id,  @RequestParam("owner") String owner, @RequestParam("version") String version, @RequestParam("is_public") Boolean isPublic) throws Exception {
+        return modelsService.downloadAllModelFilesNew(name, identifier, id, owner, version, isPublic);
     }
 
     @GetMapping("/downloadSingleFile")

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

@@ -97,7 +97,7 @@ public interface ModelsService {
 
     List<Map<String, String>> uploadModelLocal(MultipartFile[] files, String uuid) throws Exception;
 
-    ResponseEntity<InputStreamResource> downloadAllModelFilesNew(String name, String identifier, Integer id, String version, Boolean isPublic) throws IOException, Exception;
+    ResponseEntity<InputStreamResource> downloadAllModelFilesNew(String name, String identifier, Integer id, String owner, String version, Boolean isPublic) throws IOException, Exception;
 
     Page<ModelsVo> newPubilcQueryByPage(ModelsVo modelsVo, PageRequest pageRequest, String accessToken) throws Exception;
 

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

@@ -27,7 +27,7 @@ public interface NewDatasetService {
 
     ResponseEntity<InputStreamResource> downloadDatasetlocal(String filePath) throws Exception;
 
-    ResponseEntity<InputStreamResource> downloadAllDatasetFilesNew(String name, String identifier, Integer id, String version, Boolean isPublic) throws IOException, Exception;
+    ResponseEntity<InputStreamResource> downloadAllDatasetFilesNew(String name, String identifier, Integer id, String owner, String version, Boolean isPublic) throws IOException, Exception;
 
     Page<NewDatasetVo> newPersonalQueryByPage(Dataset dataset, PageRequest pageRequest) throws Exception;
 

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

@@ -580,7 +580,6 @@ public class ModelsServiceImpl implements ModelsService {
             String decryptGitLinkPassword = decrypt(gitLinkPassword);
             Integer userId = (Integer) userInfo.get("user_id");
 
-//            ci4sUsername = Boolean.TRUE.equals(modelsVo.getIsPublic()) ? Constant.Item_Public : ci4sUsername;
             String repositoryName = modelsVo.getIdentifier() == null ? ci4sUsername + "_model_" + DateUtils.dateTimeNow() : modelsVo.getIdentifier();
             ModelDependency1 modelDependency = new ModelDependency1();
             List<ModelDependency1> oldModelDependencys = modelDependency1Dao.queryModelDependency(modelsVo.getName(), null, gitLinkUsername);
@@ -704,7 +703,6 @@ public class ModelsServiceImpl implements ModelsService {
             String nextVersion = incrementVersion(versionList);
             modelsVo.setVersion(nextVersion);
         }
-//        ci4sUsername = Boolean.TRUE.equals(modelsVo.getIsPublic()) ? Constant.Item_Public : loginUser.getUsername();
         String repositoryName = modelsVo.getIdentifier() == null ? ci4sUsername + "_model_" + DateUtils.dateTimeNow() : modelsVo.getIdentifier();
         ModelDependency1 modelDependency = new ModelDependency1();
         List<ModelDependency1> oldModelDependencys = modelDependency1Dao.queryModelDependency(modelsVo.getName(), modelsVo.getId(), gitLinkUsername);
@@ -872,7 +870,6 @@ public class ModelsServiceImpl implements ModelsService {
     public String updateVersionDesc(ModelsVo modelsVo) throws Exception {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         String ci4sUsername = loginUser.getUsername();
-//        String ci4sUsername = Boolean.TRUE.equals(modelsVo.getIsPublic()) ? Constant.Item_Public : loginUser.getUsername();
         String gitLinkUsername = loginUser.getSysUser().getUserName();
         String gitLinkPassword = decrypt(loginUser.getSysUser().getOriginPassword());
         String repositoryName = modelsVo.getIdentifier();
@@ -914,12 +911,9 @@ public class ModelsServiceImpl implements ModelsService {
     }
 
     @Override
-    public ResponseEntity<InputStreamResource> downloadAllModelFilesNew(String name, String identifier, Integer id, String version, Boolean isPublic) throws Exception {
+    public ResponseEntity<InputStreamResource> downloadAllModelFilesNew(String name, String identifier, Integer id, String owner, String version, Boolean isPublic) throws Exception {
         // 命令行操作 git clone 项目地址
-        String ci4sUsername = SecurityUtils.getLoginUser().getUsername();
-//        String ci4sUsername = isPublic ? Constant.Item_Public : SecurityUtils.getLoginUser().getUsername();
-
-        String localPath1 = localPath + ci4sUsername + "/model/" + id + "/" + identifier + "/" + version;
+        String localPath1 = localPath + owner + "/model/" + id + "/" + identifier + "/" + version;
         // 打包 data 文件夹
         String dataFolderPath = localPath1 + "/model";
         String zipFilePath = localPath1 + "/model.zip";
@@ -1118,9 +1112,6 @@ public class ModelsServiceImpl implements ModelsService {
 
     @Override
     public ModelsVo getModelDetail(Integer id, String identifier, String owner, String version, Boolean isPublic) throws Exception {
-//        String ci4sUsername = SecurityUtils.getLoginUser().getUsername();
-//        String ci4sUsername = isPublic ? Constant.Item_Public : SecurityUtils.getLoginUser().getUsername();
-
         if (StringUtils.isEmpty(version)) {
             version = "origin";
         }
@@ -1217,7 +1208,6 @@ public class ModelsServiceImpl implements ModelsService {
         modelDependency1Dao.deleteModelDependency(parentModel);
 
         String ci4sUsername = SecurityUtils.getLoginUser().getUsername();
-//        String ci4sUsername = isPublic ? Constant.Item_Public : SecurityUtils.getLoginUser().getUsername();
         dvcUtils.deleteDirectory(localPath + "/" + ci4sUsername + "/model/" + repoId + "/" + identifier);
     }
 

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

@@ -114,7 +114,6 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         String owner = (String) userInfo.get("login");
 
         // 拼接project
-        ci4sUsername = Boolean.TRUE.equals(datasetVo.getIsPublic()) ? Constant.Item_Public : loginUser.getUsername();
         String repositoryName = ci4sUsername + "_dataset_" + DateUtils.dateTimeNow();
         GitProjectVo gitProjectVo = new GitProjectVo();
         gitProjectVo.setRepositoryName(repositoryName);
@@ -196,7 +195,6 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         String gitLinkUsername = loginUser.getSysUser().getUserName();
         String gitLinkPassword = decrypt(loginUser.getSysUser().getOriginPassword());
         String userReq = jedis.get(ci4sUsername + "_gitUserInfo");
-        ci4sUsername = Boolean.TRUE.equals(datasetVo.getIsPublic()) ? Constant.Item_Public : loginUser.getUsername();
         Map<String, Object> userInfo = JsonUtils.jsonToMap(userReq);
         // 创建分支
         String branchName = datasetVo.getVersion();
@@ -299,7 +297,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
     @Override
     public String updateVersionDesc(NewDatasetVo datasetVo) throws Exception {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        String ci4sUsername = Boolean.TRUE.equals(datasetVo.getIsPublic()) ? Constant.Item_Public : loginUser.getUsername();
+        String ci4sUsername = loginUser.getUsername();
         String gitLinkUsername = loginUser.getSysUser().getUserName();
         String gitLinkPassword = decrypt(loginUser.getSysUser().getOriginPassword());
         String repositoryName = datasetVo.getIdentifier();
@@ -363,15 +361,14 @@ public class NewDatasetServiceImpl implements NewDatasetService {
     @Override
     public NewDatasetVo getNewDatasetDesc(Integer id, String name, String repo, String owner, String version, Boolean isPublic) throws Exception {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        String ci4sUsername = isPublic ? Constant.Item_Public : loginUser.getUsername();
         // cd到 localPathlocal/id/下面还有一个文件夹，然后做git pull操作，然后读取里面的文件列表，列出每个文件的大小和名称，封装成MAP
         if (StringUtils.isEmpty(version)) {
             version = "origin";
         }
-        List<Map<String, Object>> fileDetailsAfterGitPull = FileUtil.getFiles(localPathlocal + ci4sUsername + "/datasets/" + id + "/" + repo + "/" + version + "/dataset");
+        List<Map<String, Object>> fileDetailsAfterGitPull = FileUtil.getFiles(localPathlocal + owner + "/datasets/" + id + "/" + repo + "/" + version + "/dataset");
 
         // 在localPathlocal+id+"/"+repositoryName目录下的dataset.yaml中取到元数据
-        Map<String, Object> stringObjectMap = YamlUtils.loadYamlFile(localPathlocal + ci4sUsername + "/datasets/" + id + "/" + repo + "/" + version + "/dataset.yaml");
+        Map<String, Object> stringObjectMap = YamlUtils.loadYamlFile(localPathlocal + owner + "/datasets/" + id + "/" + repo + "/" + version + "/dataset.yaml");
         String jsonString = JacksonUtil.toJSONString(stringObjectMap);
         NewDatasetVo newDatasetVo = JsonUtils.jsonToObject(jsonString, NewDatasetVo.class);
         List<VersionVo> versionVos = new ArrayList<>();
@@ -447,7 +444,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         gitService.deleteProject(token, owner, repo);
 
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        String ci4sUsername = isPublic ? Constant.Item_Public : loginUser.getUsername();
+        String ci4sUsername = loginUser.getUsername();
         dvcUtils.deleteDirectory(localPathlocal + "/" + ci4sUsername + "/datasets/" + repoId + "/" + repo);
     }
 
@@ -613,10 +610,9 @@ public class NewDatasetServiceImpl implements NewDatasetService {
     }
 
     @Override
-    public ResponseEntity<InputStreamResource> downloadAllDatasetFilesNew(String name, String identifier, Integer id, String version, Boolean isPublic) throws Exception {
+    public ResponseEntity<InputStreamResource> downloadAllDatasetFilesNew(String name, String identifier, Integer id, String owner, String version, Boolean isPublic) throws Exception {
         // 命令行操作 git clone 项目地址
-        String ci4sUsername = isPublic ? Constant.Item_Public : SecurityUtils.getLoginUser().getUsername();
-        String localPath = localPathlocal + ci4sUsername + "/datasets/" + id + "/" + identifier + "/" + version;
+        String localPath = localPathlocal + owner + "/datasets/" + id + "/" + identifier + "/" + version;
 
         // 打包 data 文件夹
         String dataFolderPath = localPath + "/dataset";