Merge branch 'developer' into 'master'

取数平台调整

See merge request !36

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

@@ -548,7 +548,8 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 								break;
 							} // IF OVER
 						} // FOR OVER
-						takeFile(condition);
+						Connection connection = HiveHelper.getDownloadHiveConnection();
+						takeFile(condition, connection);
 					} // 没有任务则忽略
 				}catch (Exception e){
 					log.debug("自助指标下载异常", e.getMessage());
@@ -581,7 +582,8 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 								break;
 							} // IF OVER
 						} // FOR OVER
-						takeFile(condition);
+						Connection connection = HiveHelper.getBalaDownloadHiveConnection();
+						takeFile(condition, connection);
 					} // 没有任务则忽略
 				}catch (Exception e){
 					log.debug("自助指标下载异常", e.getMessage());
@@ -591,7 +593,7 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 		}, interval*1000, interval*1000, TimeUnit.MILLISECONDS);
 	}
 
-	private void takeFile(FlatQueryTaskCondition condition){
+	private void takeFile(FlatQueryTaskCondition condition, Connection conn){
 		if (condition != null) {
 			// 更新任务状态
 			DownloadTask task = DownloadTaskServiceImpl.getInstance().getDownloadTaskById(condition.getTaskId());
@@ -609,7 +611,6 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 					0,
 					condition.getAuthStoreIdList());
 
-			Connection conn =  HiveHelper.getDownloadHiveConnection();
 			log.debug("runDownloadTask.run", "获取商户连接：" + task.getId());
 			if (conn != null) {
 				try {