Commit 9f9e9d01 by 陶光胜

取数平台调整

parent 8a3488fb
...@@ -176,6 +176,9 @@ public class CsvResultSetHelper implements ResultSetHelper { ...@@ -176,6 +176,9 @@ public class CsvResultSetHelper implements ResultSetHelper {
if (tmpResult != null && tmpResult.length() > 0) { if (tmpResult != null && tmpResult.length() > 0) {
//tmpResult = DecryptUtils.getInstance().decrypt(tmpResult); //tmpResult = DecryptUtils.getInstance().decrypt(tmpResult);
tmpResult = DecryptUtils.getInstance().decrypt(tmpResult); tmpResult = DecryptUtils.getInstance().decrypt(tmpResult);
if(tmpResult.startsWith("0")){
tmpResult = tmpResult + "\t";
}
System.out.println("tmpResult = " + tmpResult); System.out.println("tmpResult = " + tmpResult);
} // IF OVER } // IF OVER
result.add(tmpResult); result.add(tmpResult);
......
...@@ -627,8 +627,9 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService { ...@@ -627,8 +627,9 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
log.debug("自助指标当前正在执行的任务为:", JSON.toJSONString(bigTaskConditions.get(i))); log.debug("自助指标当前正在执行的任务为:", JSON.toJSONString(bigTaskConditions.get(i)));
if (bigTaskConditions.get(i).getBuildPermitted().equals(Global.YES)) { if (bigTaskConditions.get(i).getBuildPermitted().equals(Global.YES)) {
try{ try{
connection = HiveHelper.getBigDataDownloadHiveConnection();
condition = bigTaskConditions.remove(i); // 移除并获取第一个任务条件 condition = bigTaskConditions.remove(i); // 移除并获取第一个任务条件
bigTaskRunningMap.put(condition.getTaskId(), condition.getTaskId());
connection = HiveHelper.getBigDataDownloadHiveConnection();
break; break;
}catch (Exception e){ }catch (Exception e){
log.debug("获取连接异常:", e.getMessage()); log.debug("获取连接异常:", e.getMessage());
...@@ -637,7 +638,6 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService { ...@@ -637,7 +638,6 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
} }
} // IF OVER } // IF OVER
} // FOR OVER } // FOR OVER
bigTaskRunningMap.put(condition.getTaskId(), condition.getTaskId());
takeFile(condition, connection); takeFile(condition, connection);
bigTaskRunningMap.remove(condition.getTaskId()); bigTaskRunningMap.remove(condition.getTaskId());
} // 没有任务则忽略 } // 没有任务则忽略
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment