From 978d94d074a893271af3ebeafbd317778ebfefc6 Mon Sep 17 00:00:00 2001
From: chenzhihang <709011834@qq.com>
Date: Tue, 1 Apr 2025 10:19:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=B0=E5=BB=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=EF=BC=8C=E6=96=B0=E5=BB=BA=E6=88=90=E5=8A=9F=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E6=96=87=E4=BB=B6=E5=AD=98=E5=9C=A8=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/NewDatasetFromGitController.java      | 15 ++++++++++++++-
 .../service/impl/NewDatasetServiceImpl.java       |  7 +------
 .../java/com/ruoyi/platform/utils/DVCUtils.java   |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)

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<NewDatasetVo> newPubilcQueryByPage(Dataset dataset, PageRequest pageRequest) throws Exception {
+    public Page<NewDatasetVo> 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<String, Object> 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) {