feat:时间格式hh-》HH

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

@@ -213,11 +213,12 @@ public class CsvResultSetHelper implements ResultSetHelper {
 							result.add(resultSet.getTimestamp(i+1) != null ? timeFormatter_threadLocal.get().format(resultSet.getTimestamp(i+1)) : "");
 							break;
 						default:
-							Object val = resultSet.getObject(i + 1);
-							String s2="";
-							if (val != null) {
-								s2 = String.valueOf(val);
-							}
+							String s2 = String.valueOf(resultSet.getObject(i + 1));
+//							Object val = resultSet.getObject(i + 1);
+//							String s2="";
+//							if (val != null) {
+//								s2 = String.valueOf(val);
+//							}
 //							if(org.apache.commons.lang3.StringUtils.isNotBlank(s2)){
 //								if(s2.contains("E0") || s2.startsWith("0")){
 //									s2 = s2 + "\t";

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

@@ -995,7 +995,7 @@ public class FlatQueryResultServiceImpl implements IFlatQueryResultService {
 					Integer type = columnMate.get(j).getValue();
 					Cell midCell = row.createCell(j);
 					String columnValue = columnValues[j];
-					if (StringUtils.isBlank(columnValue)) {
+					if (columnValue.equals("null")) {
 						midCell.setCellValue(columnValue);
 						continue;
 					}

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

@@ -660,7 +660,7 @@ public class FreeQueryServiceImpl implements IFreeQueryService {
 						case Types.INTEGER:
 							String intStr = rs.getString(j + 1);
 							if (StringUtils.isBlank(intStr)){
-								midCell.setCellValue(0);
+								midCell.setCellValue(intStr);
 							}else {
 								midCell.setCellValue(Integer.valueOf(intStr));
 							}
@@ -668,7 +668,7 @@ public class FreeQueryServiceImpl implements IFreeQueryService {
 						case Types.BIGINT:
 							String bigintStr = rs.getString(j + 1);
 							if (StringUtils.isBlank(bigintStr)){
-								midCell.setCellValue(0);
+								midCell.setCellValue(bigintStr);
 							}else {
 								midCell.setCellValue(Long.valueOf(bigintStr));
 							}
@@ -677,7 +677,7 @@ public class FreeQueryServiceImpl implements IFreeQueryService {
 						case Types.DECIMAL:
 							String doubleStr = rs.getString(j + 1);
 							if (StringUtils.isBlank(doubleStr)) {
-								midCell.setCellValue(0);
+								midCell.setCellValue(doubleStr);
 							}else {
 								midCell.setCellValue(Double.valueOf(doubleStr));
 							}
@@ -685,7 +685,7 @@ public class FreeQueryServiceImpl implements IFreeQueryService {
 						case Types.FLOAT:
 							String floatStr = rs.getString(j + 1);
 							if (StringUtils.isBlank(floatStr)) {
-								midCell.setCellValue(0);
+								midCell.setCellValue(floatStr);
 							}else {
 								midCell.setCellValue(Float.valueOf(floatStr));
 							}