Browse Source

优化新建数据集上传文件删除,新建成功数据集文件存在删除上传文件bug

dev-active_learn
chenzhihang 10 months ago
parent
commit
978d94d074
3 changed files with 16 additions and 8 deletions
  1. +14
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/NewDatasetFromGitController.java
  2. +1
    -6
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java
  3. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DVCUtils.java

+ 14
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/NewDatasetFromGitController.java View File

@@ -3,6 +3,7 @@ package com.ruoyi.platform.controller.dataset;
import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.platform.domain.Dataset; import com.ruoyi.platform.domain.Dataset;
import com.ruoyi.platform.service.NewDatasetService; import com.ruoyi.platform.service.NewDatasetService;
import com.ruoyi.platform.utils.DVCUtils;
import com.ruoyi.platform.vo.LabelDatasetVersionVo; import com.ruoyi.platform.vo.LabelDatasetVersionVo;
import com.ruoyi.platform.vo.NewDatasetVo; import com.ruoyi.platform.vo.NewDatasetVo;
import com.ruoyi.platform.vo.QueryModelMetricsVo; import com.ruoyi.platform.vo.QueryModelMetricsVo;
@@ -15,6 +16,8 @@ import org.springframework.web.multipart.MultipartFile;


import javax.annotation.Nullable; import javax.annotation.Nullable;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
@@ -29,6 +32,8 @@ public class NewDatasetFromGitController {
@Resource @Resource
private NewDatasetService newDatasetService; private NewDatasetService newDatasetService;


@Resource
private DVCUtils dvcUtils;


/** /**
* 新增数据集与版本新 * 新增数据集与版本新
@@ -172,7 +177,15 @@ public class NewDatasetFromGitController {


@PostMapping("/getVersionsCompare") @PostMapping("/getVersionsCompare")
@ApiOperation(value = "获取数据集版本对比") @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)); 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("删除成功");
}
} }

+ 1
- 6
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java View File

@@ -337,13 +337,8 @@ public class NewDatasetServiceImpl implements NewDatasetService {
} }


@Override @Override
public Page<NewDatasetVo> newPubilcQueryByPage(Dataset dataset, PageRequest pageRequest) throws Exception {
public Page<NewDatasetVo> newPubilcQueryByPage(Dataset dataset, PageRequest pageRequest) {
String token = gitService.checkoutToken(); 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 // 拼接查询url
String url = gitendpoint + "/api/projects.json?sort_direction=updated_on&sort_by=desc&category_id=" + Constant.Git_Category_Id; String url = gitendpoint + "/api/projects.json?sort_direction=updated_on&sort_by=desc&category_id=" + Constant.Git_Category_Id;




+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DVCUtils.java View File

@@ -91,7 +91,7 @@ public class DVCUtils {
} }
} }


private void deletePath(Path path) {
public void deletePath(Path path) {
try { try {
Files.deleteIfExists(path); Files.deleteIfExists(path);
} catch (IOException e) { } catch (IOException e) {


Loading…
Cancel
Save