feat:存储桶

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

@@ -18,6 +18,7 @@ import com.gic.dubbo.entity.ProviderLocalTag;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.qcloud.BucketNameEnum;
+import com.gic.qcloud.FileRecordLogUtil;
 import com.gic.qcloud.FileUploadUtil;
 import com.gic.thirdparty.cloudfile.CloudFileUtil;
 import com.gic.thirdparty.cloudfile.enums.CloudFileBusinessOptEnum;
@@ -111,6 +112,7 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 	private String cloudFileUpload(String enterpriseId,File file,String fileExt){
 		EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(enterpriseId);
 		CloudFileInfo zip = CloudFileUtil.uploadFile(file, fileExt, CloudFileTypeEnum.FILE, enterprise.getFactoryCode(), CloudFileBusinessOptEnum.HOOK_COMMON);
+		FileRecordLogUtil.recordUseLog("FlatQueryResultServiceImpl#cloudFileUpload||"+fileExt);
 		return zip.getOrgFileUrl();
 	}
 

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

@@ -17,6 +17,7 @@ import com.gic.cloud.data.hook.service.entity.CsvResultSetHelper;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.qcloud.BucketNameEnum;
+import com.gic.qcloud.FileRecordLogUtil;
 import com.gic.qcloud.FileUploadUtil;
 import com.gic.thirdparty.cloudfile.CloudFileUtil;
 import com.gic.thirdparty.cloudfile.enums.CloudFileBusinessOptEnum;
@@ -570,16 +571,11 @@ public class FreeQueryServiceImpl implements IFreeQueryService {
 //										}
 //										log.debug("开始上传压缩文件到腾讯云", task.getId());
 //										cloudFileUrl += FileUploadUtil.simpleUploadFileFromLocal(zipFile, task.getName() + "-" + task.getId()+taskFileExt, BucketNameEnum.COMPRESS_60000.getName());
-										EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(task.getEnterpriseId());
-										CloudFileInfo zip = CloudFileUtil.uploadFile(zipFile, "zip", CloudFileTypeEnum.FILE, enterprise.getFactoryCode(), CloudFileBusinessOptEnum.HOOK_COMMON);
-										cloudFileUrl=zip.getOrgFileUrl();
+										cloudFileUrl = cloudFileUpload(task.getEnterpriseId(), zipFile, taskFileExt.substring(1));
 									} else {
 										log.debug("开始上传文件到腾讯云", task.getId());
 //										cloudFileUrl += FileUploadUtil.simpleUploadFileFromLocal(new File(originalFilePath), task.getName() + "-" + task.getId()+taskFileExt, BucketNameEnum.REPORT_50000.getName());
-
-										EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(task.getEnterpriseId());
-										CloudFileInfo zip = CloudFileUtil.uploadFile(new File(originalFilePath), taskFileExt.substring(1), CloudFileTypeEnum.FILE, enterprise.getFactoryCode(), CloudFileBusinessOptEnum.HOOK_COMMON);
-										cloudFileUrl=zip.getOrgFileUrl();
+										cloudFileUrl = cloudFileUpload(task.getEnterpriseId(), new File(originalFilePath), taskFileExt.substring(1));
 									}
 									log.debug("上传腾讯云", "地址为："+cloudFileUrl);
 									task.setStatus(DownloadTaskStatus.COMPLISHED);
@@ -612,6 +608,15 @@ public class FreeQueryServiceImpl implements IFreeQueryService {
 		}, interval*1000, interval*1000, TimeUnit.MILLISECONDS);
 	}
 
+	private String cloudFileUpload(String enterpriseId,File file,String fileExt){
+		EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(enterpriseId);
+		CloudFileInfo zip = CloudFileUtil.uploadFile(file, fileExt, CloudFileTypeEnum.FILE, enterprise.getFactoryCode(), CloudFileBusinessOptEnum.HOOK_COMMON);
+		FileRecordLogUtil.recordUseLog("FreeQueryServiceImpl#cloudFileUpload||"+fileExt);
+		return zip.getOrgFileUrl();
+	}
+
+
+
 	private void saveXlsx(FreeQueryTaskCondition condition,String originalFilePath,ResultSet rs,DownloadTask task) throws Exception{
 		Integer limitSize = FileUtil.getLimitSize();
 //		originalFilePath = SAVE_FOLDER + "/" + condition.getTaskId() + ".xlsx";