Merge branch 'developer' into 'master'

取数平台下载优化

See merge request !11

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

@@ -508,6 +508,7 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 		this.downloadTaskTimer.schedule(new TimerTask() {
 			@Override
 			public void run() {
+				try{
 					if (taskConditions != null && taskConditions.size() > 0) {
 						FlatQueryTaskCondition condition = null;
 						//FlatQueryTaskCondition condition = taskConditions.remove(0); // 移除并获取第一个任务条件
@@ -676,6 +677,10 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 							} // IF OVER
 						} // IF OVER
 					} // 没有任务则忽略
+				}catch (Exception e){
+					log.debug("自助指标下载异常", e.getMessage());
+					e.printStackTrace();
+				}
 			} // run Define Over
 		}, interval * 1000, interval * 1000);// 配置中的值为毫秒
 	}

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

@@ -358,6 +358,7 @@ public class FreeQueryServiceImpl implements IFreeQueryService {
 		this.downloadTaskTimer.schedule(new TimerTask() {
 			@Override
 			public void run() {
+				try {
 					if (taskConditions != null && taskConditions.size() > 0) {
 						//FreeQueryTaskCondition condition = taskConditions.remove(0); // 移除并获取第一个任务条件
 						FreeQueryTaskCondition condition = null;
@@ -510,6 +511,10 @@ public class FreeQueryServiceImpl implements IFreeQueryService {
 							} // IF OVER
 						} // IF OVER
 					} // 没有任务则忽略
+				}catch (Exception e){
+					log.debug("自定义查询下载异常", e.getMessage());
+					e.printStackTrace();
+				}
 			} // run Define Over
 		}, interval * 1000, interval * 1000);// 配置中的值为毫秒
 	}