Merge branch 'developer' of http://115.159.76.241/data-hook/gic-cloud into developer

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/impl/FreeQueryServiceImpl.java

@@ -484,7 +484,8 @@ public class FreeQueryServiceImpl implements IFreeQueryService {
 										wb.dispose(); // SXSSFWorkbook 没有 close 方法
 										log.debug("runDownloadTask.run", "已生成自定义查询下载文件 " + condition.getTaskId() + ".xlsx");
 									}
-									String cloudFileUrl = "";
+									String cloudFileUrl = "https://";
+									String taskFileExt = task.getUseCompress().equals(Global.YES) ? ".zip" : task.getFormat().equals(DownloadFileFormat.CSV) ? ".csv" : ".xlsx";
 									if (task.getUseCompress().equals(Global.YES)) {
 										log.debug("runDownloadTask.run", "准备生成自定义查询压缩文件 " + condition.getTaskId() + ".zip");
 										String zipFilePath = SAVE_FOLDER + "/" + condition.getTaskId() + ".zip";
@@ -514,15 +515,16 @@ public class FreeQueryServiceImpl implements IFreeQueryService {
 											zos.closeEntry();
 											zos.close();
 										}
-										cloudFileUrl = FileUploadUtil.simpleUploadFileFromLocal(zipFile, task.getId(), BucketNameEnum.COMPRESS_60000.getName());
+										log.debug("开始上传压缩文件到腾讯云", task.getId());
+										cloudFileUrl += FileUploadUtil.simpleUploadFileFromLocal(zipFile, task.getName() + "-" + task.getId()+taskFileExt, BucketNameEnum.COMPRESS_60000.getName());
 									} else {
-										cloudFileUrl = FileUploadUtil.simpleUploadFileFromLocal(new File(originalFilePath), task.getId(), BucketNameEnum.REPORT_50000.getName());
+										log.debug("开始上传文件到腾讯云", task.getId());
+										cloudFileUrl += FileUploadUtil.simpleUploadFileFromLocal(new File(originalFilePath), task.getName() + "-" + task.getId()+taskFileExt, BucketNameEnum.REPORT_50000.getName());
 									}
 									log.debug("上传腾讯云", "地址为："+cloudFileUrl);
 									task.setStatus(DownloadTaskStatus.COMPLISHED);
 									task.setOverTime(new java.util.Date());
 
-									String taskFileExt = task.getUseCompress().equals(Global.YES) ? ".zip" : task.getFormat().equals(DownloadFileFormat.CSV) ? ".csv" : ".xlsx";
 									task.setFilePath(cloudFileUrl);
 									DownloadTaskServiceImpl.getInstance().updateDownloadTask(task);