Commit 3c96e6d0 by fudahua

feat: 新版本的下载

parent ab91d833
...@@ -677,6 +677,7 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService { ...@@ -677,6 +677,7 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
if (CollectionUtils.isNotEmpty(downloadTasks)) { if (CollectionUtils.isNotEmpty(downloadTasks)) {
for (DownloadTask downloadTask : downloadTasks) { for (DownloadTask downloadTask : downloadTasks) {
downloadTask.setStatus(DownloadTaskStatus.BUILDING); downloadTask.setStatus(DownloadTaskStatus.BUILDING);
downloadTask.setDownloadTime(new Date());
DownloadTaskServiceImpl.getInstance().updateDownloadTask(downloadTask); DownloadTaskServiceImpl.getInstance().updateDownloadTask(downloadTask);
} }
} }
...@@ -863,14 +864,12 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService { ...@@ -863,14 +864,12 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
return; return;
} }
FlatQueryTaskCondition condition = JSON.parseObject(task.getDownloadCondition(), FlatQueryTaskCondition.class); FlatQueryTaskCondition condition = JSON.parseObject(task.getDownloadCondition(), FlatQueryTaskCondition.class);
if (!task.getStatus().equals(DownloadTaskStatus.DOWNLOAD_HDFS)) { if (!task.getStatus().equals(DownloadTaskStatus.BUILDING)) {
logger.info("文件hdfs没有处理完成:{}",JSONObject.toJSONString(task)); logger.info("文件hdfs没有处理完成:{}",JSONObject.toJSONString(task));
return; return;
} }
task.setStatus(DownloadTaskStatus.DOWNLOAD_HDFS);
task.setDownloadWay(-1); task.setDownloadWay(-1);
task.setFieldSize(condition.getAllFields().size()); task.setFieldSize(condition.getAllFields().size());
task.setDownloadTime(new Date());
//下载文件 //下载文件
String dirName="hdfs"+task.getId(); String dirName="hdfs"+task.getId();
String path=HDFS_URL+"/"+dirName; String path=HDFS_URL+"/"+dirName;
......
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