取数平台日志

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.gic.cloud.common.api.base.Page;
 import com.gic.cloud.data.hook.api.dto.*;
 import com.gic.cloud.data.hook.api.entity.*;
+import com.gic.cloud.data.hook.api.service.IDownloadTaskService;
 import com.gic.cloud.data.hook.api.service.IFlatQueryResultService;
 import com.gic.cloud.data.hook.service.DecryptUtils;
 import com.gic.cloud.data.hook.service.HiveHelper;
@@ -57,6 +58,8 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 
 	@Autowired
 	FlatQueryTableDao flatQueryTableDao;
+	@Autowired
+	IDownloadTaskService downloadTaskService;
 
 	/** 自助指标查询关联的下载条件列表 */
 	protected List<FlatQueryTaskCondition> taskConditions = Lists.newArrayList();
@@ -466,14 +469,18 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 	@Override
 	@PostConstruct
 	public void initTask(){
-		List<DownloadRecord> list = DownloadTaskServiceImpl.getInstance().listUnDownloadTask(QueryDataSource.FLAT_QUERY);
-		if(CollectionUtils.isNotEmpty(list)){
-			for(DownloadRecord record : list){
-				if(StringUtils.isNotBlank(record.getDownloadCondition())){
-					FlatQueryTaskCondition condition = JSON.parseObject(record.getDownloadCondition(), FlatQueryTaskCondition.class);
-					this.taskConditions.add(condition);
+		try {
+			List<DownloadRecord> list = this.downloadTaskService.listUnDownloadTask(QueryDataSource.FLAT_QUERY);
+			if(CollectionUtils.isNotEmpty(list)){
+				for(DownloadRecord record : list){
+					if(StringUtils.isNotBlank(record.getDownloadCondition())){
+						FlatQueryTaskCondition condition = JSON.parseObject(record.getDownloadCondition(), FlatQueryTaskCondition.class);
+						this.taskConditions.add(condition);
+					}
 				}
 			}
+		}catch (Exception e){
+			e.printStackTrace();
 		}
 	}
 

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.gic.cloud.data.hook.api.dto.*;
 import com.gic.cloud.data.hook.api.dto.DataDesensiType;
 import com.gic.cloud.data.hook.api.entity.*;
+import com.gic.cloud.data.hook.api.service.IDownloadTaskService;
 import com.gic.cloud.data.hook.api.service.IFreeQueryService;
 import com.gic.cloud.data.hook.service.HiveHelper;
 import com.gic.cloud.data.hook.service.HttpUtils;
@@ -53,6 +54,9 @@ public class FreeQueryServiceImpl implements IFreeQueryService {
 	/** 脱敏字段 */
 	public static final List<String> FILTERS_PHONE_AND_CARD = Arrays.asList("card_num", "mobile", "phone", "enterprise_name", "phone_number", "receive_phone_number","receive_card_num","use_phone_number", "use_card_num");
 
+	@Autowired
+	IDownloadTaskService downloadTaskService;
+
 	/** 获取指定脱敏类型的过滤字段集合
 	 * @param desensiType
 	 * @return
@@ -316,23 +320,27 @@ public class FreeQueryServiceImpl implements IFreeQueryService {
 	@Override
 	@PostConstruct
 	public void initTask() {
-		List<DownloadRecord> list = DownloadTaskServiceImpl.getInstance().listUnDownloadTask(QueryDataSource.FREE_QUERY);
-		if(CollectionUtils.isNotEmpty(list)) {
-			for (DownloadRecord record : list) {
-				if(record.getDesensiType() != null){
-					FreeQueryTaskCondition condition = new FreeQueryTaskCondition();
-					condition.setTaskId(record.getId());
-					condition.setSql(record.getRealSql());
-					condition.setEnterpriseId(record.getEnterpriseId());
-					condition.setDesensiType(record.getDesensiType());
-					// 设置条件可否执行
-					if (record.getApplyPermitted().equals(Global.YES)) {
-						condition.setBuildPermitted(Global.YES);
-					} else condition.setBuildPermitted(Global.NO);
-					// 保存至列表
-					this.taskConditions.add(condition);
+		try{
+			List<DownloadRecord> list = this.downloadTaskService.listUnDownloadTask(QueryDataSource.FREE_QUERY);
+			if(CollectionUtils.isNotEmpty(list)) {
+				for (DownloadRecord record : list) {
+					if(record.getDesensiType() != null){
+						FreeQueryTaskCondition condition = new FreeQueryTaskCondition();
+						condition.setTaskId(record.getId());
+						condition.setSql(record.getRealSql());
+						condition.setEnterpriseId(record.getEnterpriseId());
+						condition.setDesensiType(record.getDesensiType());
+						// 设置条件可否执行
+						if (record.getApplyPermitted().equals(Global.YES)) {
+							condition.setBuildPermitted(Global.YES);
+						} else condition.setBuildPermitted(Global.NO);
+						// 保存至列表
+						this.taskConditions.add(condition);
+					}
 				}
 			}
+		}catch (Exception e){
+			e.printStackTrace();
 		}
 	}