Merge branch 'master' into developer

# Conflicts:
#	gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/entity/CsvResultSetHelper.java

gic-cloud-data-hook-service/src/main/java/com/gic/cloud/data/hook/service/entity/CsvResultSetHelper.java

@@ -25,6 +25,7 @@ import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Types;
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -109,9 +110,29 @@ public class CsvResultSetHelper implements ResultSetHelper {
 
 	private static SimpleDateFormat datetimeFormatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
+	private static ThreadLocal<DateFormat> datetimeFormatter_threadLocal = new ThreadLocal<DateFormat>() {
+		@Override
+		protected DateFormat initialValue() {
+			return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		}
+	};
+
 	private static SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd");
 
+	private static ThreadLocal<DateFormat> dateFormatter_threadLocal = new ThreadLocal<DateFormat>() {
+		@Override
+		protected DateFormat initialValue() {
+			return new SimpleDateFormat("yyyy-MM-dd");
+		}
+	};
+
 	private static SimpleDateFormat timeFormatter = new SimpleDateFormat("hh:mm:ss");
+	private static ThreadLocal<DateFormat> timeFormatter_threadLocal = new ThreadLocal<DateFormat>() {
+		@Override
+		protected DateFormat initialValue() {
+			return new SimpleDateFormat("hh:mm:ss");
+		}
+	};
 
 	@Override
 	public String[] getColumnValues(ResultSet resultSet, boolean b, String s, String s1) throws SQLException, IOException {
@@ -185,16 +206,16 @@ public class CsvResultSetHelper implements ResultSetHelper {
 					int columnType = resultSet.getMetaData().getColumnType(i + 1);
 					switch (columnType) {
 						case Types.TIMESTAMP:
-							String time = resultSet.getTimestamp(i + 1) != null ? datetimeFormatter.format(resultSet.getTimestamp(i + 1)) : "";
+							String time = resultSet.getTimestamp(i+1) != null ? datetimeFormatter_threadLocal.get().format(resultSet.getTimestamp(i+1)) : "";
 							result.add(time);
 							FilterFieldUtils.checkTime(columnName,time,resultSet.getObject(i+1));
 							break;
 						case Types.DATE:
 							//result[i] = resultSet.getTimestamp(columnName) != null ? dateFormatter.format(resultSet.getTimestamp(columnName)) : "";
-							result.add(resultSet.getDate(i+1) != null ? dateFormatter.format(resultSet.getDate(i+1)) : "");
+							result.add(resultSet.getDate(i+1) != null ? dateFormatter_threadLocal.get().format(resultSet.getDate(i+1)) : "");
 							break;
 						case Types.TIME:
-							result.add(resultSet.getTimestamp(i+1) != null ? timeFormatter.format(resultSet.getTimestamp(i+1)) : "");
+							result.add(resultSet.getTimestamp(i+1) != null ? timeFormatter_threadLocal.get().format(resultSet.getTimestamp(i+1)) : "");
 							break;
 						default:
 							String s2 = String.valueOf(resultSet.getObject(i + 1));

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

@@ -216,7 +216,6 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 			queryFull+= " " + queryOrder + " " +queryDir  +" ";
 		}
 		queryFull+=  queryLimit;
-
 		log.debug("buildFlatQuerySQL","生成自助指标查询SQL：" + queryFull);
 		return queryFull;
 	}