feat:存储桶

gic-cloud-data-hook-api/.flattened-pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.gic</groupId>
   <artifactId>gic-cloud-data-hook-api</artifactId>
-  <version>2.40</version>
+  <version>2.42</version>
   <dependencies>
     <dependency>
       <groupId>com.gic</groupId>
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>com.gic</groupId>
       <artifactId>gic-platform-config</artifactId>
-      <version>2.26</version>
+      <version>2.29</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

gic-cloud-data-hook-service/pom.xml

@@ -183,6 +183,11 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>com.gic</groupId>
+			<artifactId>gic-enterprise-api</artifactId>
+			<version>${gic-enterprise-api}</version>
+		</dependency>
 
 	</dependencies>
 

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

@@ -15,8 +15,14 @@ import com.gic.cloud.data.hook.service.dao.FlatQueryTableDao;
 import com.gic.cloud.data.hook.service.entity.CsvDataFilterMode;
 import com.gic.cloud.data.hook.service.entity.CsvResultSetHelper;
 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.FileUploadUtil;
+import com.gic.thirdparty.cloudfile.CloudFileUtil;
+import com.gic.thirdparty.cloudfile.enums.CloudFileBusinessOptEnum;
+import com.gic.thirdparty.cloudfile.enums.CloudFileTypeEnum;
+import com.gic.thirdparty.cloudfile.pojo.CloudFileInfo;
 import com.google.common.collect.Lists;
 import com.opencsv.CSVWriter;
 import com.opencsv.ResultSetHelper;
@@ -85,6 +91,9 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 	@Autowired
 	DecryptKeyService decryptKeyService;
 
+	@Autowired
+	private EnterpriseService enterpriseService;
+
 	/** 自助指标查询关联的下载条件列表 */
 	protected List<FlatQueryTaskCondition> taskConditions = Lists.newArrayList();
 	protected List<FlatQueryTaskCondition> bigTaskConditions = Lists.newArrayList();
@@ -99,6 +108,12 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 		runApplyTask(5); // 每5秒钟进行任务状态检测
 	}
 
+	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);
+		return zip.getOrgFileUrl();
+	}
+
 	/** 生成自助指标查询最终 SQL
 	 * @param queryOrDownload 查询或下载用途
 	 * @param tableId
@@ -931,10 +946,12 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 //							zos.close();
 //						}
 						logger.info("[ 开始上传压缩文件到腾讯云 ]: {}", task.getId());
-						cloudFileUrl += FileUploadUtil.simpleUploadFileFromLocal(zipFile, task.getName() + "-" + task.getId()+taskFileExt, BucketNameEnum.COMPRESS_60000.getName());
+//						cloudFileUrl += FileUploadUtil.simpleUploadFileFromLocal(zipFile, task.getName() + "-" + task.getId()+taskFileExt, BucketNameEnum.COMPRESS_60000.getName());
+						cloudFileUrl = cloudFileUpload(task.getEnterpriseId(),zipFile,taskFileExt.substring(1));
 					} else {
 						logger.info("[ 开始上传文件到腾讯云 ]: {}", task.getId());
-						cloudFileUrl += FileUploadUtil.simpleUploadFileFromLocal(new File(originalFilePath), task.getName() + "-" + task.getId()+taskFileExt, BucketNameEnum.REPORT_50000.getName());
+//						cloudFileUrl += FileUploadUtil.simpleUploadFileFromLocal(new File(originalFilePath), task.getName() + "-" + task.getId()+taskFileExt, BucketNameEnum.REPORT_50000.getName());
+						cloudFileUrl = cloudFileUpload(task.getEnterpriseId(),new File(originalFilePath),taskFileExt.substring(1));
 					}
 
 					logger.info("[ 上传腾讯云 ]: {}", "地址为："+cloudFileUrl);

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

@@ -14,8 +14,14 @@ import com.gic.cloud.data.hook.service.dao.FreeQueryRecordDao;
 import com.gic.cloud.data.hook.service.dao.FreeQuerySourceDao;
 import com.gic.cloud.data.hook.service.entity.CsvDataFilterMode;
 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.FileUploadUtil;
+import com.gic.thirdparty.cloudfile.CloudFileUtil;
+import com.gic.thirdparty.cloudfile.enums.CloudFileBusinessOptEnum;
+import com.gic.thirdparty.cloudfile.enums.CloudFileTypeEnum;
+import com.gic.thirdparty.cloudfile.pojo.CloudFileInfo;
 import com.google.common.collect.Lists;
 import com.opencsv.CSVWriter;
 import com.opencsv.ResultSetHelper;
@@ -59,6 +65,9 @@ public class FreeQueryServiceImpl implements IFreeQueryService {
 	@Autowired
 	IDownloadTaskService downloadTaskService;
 
+	@Autowired
+	private EnterpriseService enterpriseService;
+
 	/** 获取指定脱敏类型的过滤字段集合
 	 * @param desensiType
 	 * @return
@@ -560,10 +569,17 @@ public class FreeQueryServiceImpl implements IFreeQueryService {
 //											zos.close();
 //										}
 //										log.debug("开始上传压缩文件到腾讯云", task.getId());
-										cloudFileUrl += FileUploadUtil.simpleUploadFileFromLocal(zipFile, task.getName() + "-" + task.getId()+taskFileExt, BucketNameEnum.COMPRESS_60000.getName());
+//										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();
 									} else {
 										log.debug("开始上传文件到腾讯云", task.getId());
-										cloudFileUrl += FileUploadUtil.simpleUploadFileFromLocal(new File(originalFilePath), task.getName() + "-" + task.getId()+taskFileExt, BucketNameEnum.REPORT_50000.getName());
+//										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();
 									}
 									log.debug("上传腾讯云", "地址为："+cloudFileUrl);
 									task.setStatus(DownloadTaskStatus.COMPLISHED);

gic-cloud-data-hook-service/src/main/resources/data-hook-service-dubbo-config.xml

@@ -35,6 +35,8 @@
 
     <dubbo:service interface="com.gic.cloud.data.hook.api.service.TableSyncRecordService" ref="tableSyncRecordServiceImpl"/>
 
+    <dubbo:reference interface="com.gic.enterprise.api.service.EnterpriseService" id="enterpriseService" timeout="10000" />
+
     <!-- 引用的 Dubbo 服务 -->
     <!--<dubbo:reference interface="com.gic.dict.api.service.ManagerDictService" id="managerDictService" timeout="10000" />
     <dubbo:reference interface="com.gic.cloud.communicate.api.service.member.MemberTagFieldService" id="memberTagFieldService" timeout="10000" />