diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/NewDatasetFromGitController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/NewDatasetFromGitController.java index 2c60c3e6..f572dd45 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/NewDatasetFromGitController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/NewDatasetFromGitController.java @@ -3,6 +3,7 @@ package com.ruoyi.platform.controller.dataset; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.platform.domain.Dataset; import com.ruoyi.platform.service.NewDatasetService; +import com.ruoyi.platform.utils.DVCUtils; import com.ruoyi.platform.vo.LabelDatasetVersionVo; import com.ruoyi.platform.vo.NewDatasetVo; import com.ruoyi.platform.vo.QueryModelMetricsVo; @@ -15,6 +16,8 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Nullable; import javax.annotation.Resource; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.List; import java.util.Map; import java.util.Optional; @@ -29,6 +32,8 @@ public class NewDatasetFromGitController { @Resource private NewDatasetService newDatasetService; + @Resource + private DVCUtils dvcUtils; /** * 新增数据集与版本新 @@ -172,7 +177,15 @@ public class NewDatasetFromGitController { @PostMapping("/getVersionsCompare") @ApiOperation(value = "获取数据集版本对比") - public AjaxResult getVersionsCompare(@RequestBody QueryModelMetricsVo querydatasetVo) throws Exception{ + public AjaxResult getVersionsCompare(@RequestBody QueryModelMetricsVo querydatasetVo) throws Exception { return AjaxResult.success(this.newDatasetService.getVersionsCompare(querydatasetVo)); } + + @DeleteMapping("/deleteFile") + @ApiOperation(value = "删除文件") + public AjaxResult deleteFile(@RequestParam("url") String url, @RequestParam("fileName") String fileName) { + Path file = Paths.get(url, System.getProperty("file.separator"), fileName); + dvcUtils.deletePath(file); + return AjaxResult.success("删除成功"); + } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java index a8f1eeb1..10fd451d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java @@ -337,13 +337,8 @@ public class NewDatasetServiceImpl implements NewDatasetService { } @Override - public Page newPubilcQueryByPage(Dataset dataset, PageRequest pageRequest) throws Exception { + public Page newPubilcQueryByPage(Dataset dataset, PageRequest pageRequest) { String token = gitService.checkoutToken(); - Jedis jedis = new Jedis(redisHost, redisPort); - LoginUser loginUser = SecurityUtils.getLoginUser(); - String ci4sUsername = loginUser.getUsername(); - String userReq = jedis.get(ci4sUsername + "_gitUserInfo"); - Map userInfo = JsonUtils.jsonToMap(userReq); // 拼接查询url String url = gitendpoint + "/api/projects.json?sort_direction=updated_on&sort_by=desc&category_id=" + Constant.Git_Category_Id; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DVCUtils.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DVCUtils.java index 7ecbdc51..5be79efa 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DVCUtils.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DVCUtils.java @@ -91,7 +91,7 @@ public class DVCUtils { } } - private void deletePath(Path path) { + public void deletePath(Path path) { try { Files.deleteIfExists(path); } catch (IOException e) {