Commit 681e41fc by fudahua

feat: 新版本的下载

parent 233a403c
...@@ -980,7 +980,8 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService { ...@@ -980,7 +980,8 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
List<ColumnInfo> titles=null; List<ColumnInfo> titles=null;
List<FlatQueryCondition> conditions = condition.getConditions(); List<FlatQueryCondition> conditions = condition.getConditions();
Map<String, ColumnInfo> columnInfoMap = conditions.stream().collect(Collectors.toMap(mid -> mid.getFieldMark(), mid -> new ColumnInfo(mid.getFieldType(), mid.getFieldMark()))); Map<String, ColumnInfo> columnInfoMap = conditions.stream().collect(Collectors.toMap(mid -> mid.getFieldMark(), mid -> new ColumnInfo(mid.getFieldType(), mid.getFieldMark())));
for (File midFile : files) { List<File> fileList = Arrays.stream(files).sorted(Comparator.comparing(File::getName)).collect(Collectors.toList());
for (File midFile : fileList) {
if (!midFile.getName().endsWith("csv")) { if (!midFile.getName().endsWith("csv")) {
continue; continue;
} }
......
...@@ -18,7 +18,7 @@ public class Test { ...@@ -18,7 +18,7 @@ public class Test {
@org.junit.Test @org.junit.Test
public void test(){ public void test(){
DownloadTask downloadTask = downloadTaskService.getDownloadTaskById("1680836264864"); DownloadTask downloadTask = downloadTaskService.getDownloadTaskById("1680844420436");
flatQueryResultService.takeFileNew(downloadTask); flatQueryResultService.takeFileNew(downloadTask);
try { try {
Thread.sleep(10000000000L); Thread.sleep(10000000000L);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment