|
@@ -22,10 +22,7 @@ import org.springframework.web.bind.annotation.*;
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
import java.security.InvalidKeyException;
|
|
import java.security.InvalidKeyException;
|
|
import java.security.NoSuchAlgorithmException;
|
|
import java.security.NoSuchAlgorithmException;
|
|
-import java.util.Arrays;
|
|
|
|
-import java.util.Date;
|
|
|
|
-import java.util.List;
|
|
|
|
-import java.util.Map;
|
|
|
|
|
|
+import java.util.*;
|
|
|
|
|
|
import static io.renren.common.utils.ShiroUtils.getUserId;
|
|
import static io.renren.common.utils.ShiroUtils.getUserId;
|
|
|
|
|
|
@@ -158,6 +155,16 @@ public class DataSetController {
|
|
@RequestMapping("/downloadDataset")
|
|
@RequestMapping("/downloadDataset")
|
|
public R downloadStaticDataset(String datasetName){
|
|
public R downloadStaticDataset(String datasetName){
|
|
//从minio获得数据集的url,直接返回给前端
|
|
//从minio获得数据集的url,直接返回给前端
|
|
|
|
+ List<FileTest> dataset = new ArrayList<>();
|
|
|
|
+ try {
|
|
|
|
+ dataset = MinIoUtils.listFiles("dataset", datasetName.split("\\.")[0]);
|
|
|
|
+
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ }
|
|
|
|
+ if (dataset.size() ==0){
|
|
|
|
+ return R.error(404,"文件不存在");
|
|
|
|
+ }
|
|
String downloadUrl= MinIoUtils.getFileUrl("dataset",datasetName);
|
|
String downloadUrl= MinIoUtils.getFileUrl("dataset",datasetName);
|
|
return R.ok().put("downloadUrl",downloadUrl);
|
|
return R.ok().put("downloadUrl",downloadUrl);
|
|
}
|
|
}
|