取数平台调整

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

@@ -120,7 +120,7 @@ public class CsvResultSetHelper implements ResultSetHelper {
 		int columnCount = resultSet.getMetaData().getColumnCount();
 		if (columnCount > 0) {
 			for (int i=0; i<columnCount; i++) {
-				String columnName = resultSet.getMetaData().getColumnLabel(i + 1);
+				String columnName = resultSet.getMetaData().getColumnName(i + 1);
 				// 数据处理判断
 				boolean doDesensi = false; // 是否进行脱敏
 				boolean doDecrypt = false; // 是否进行解密
@@ -154,12 +154,12 @@ public class CsvResultSetHelper implements ResultSetHelper {
 					if(allFields != null && isName(columnName)){
 						result.add(DecryptUtils.dataSecurityProcessUserName(DecryptUtils.decrypt(resultSet.getString(columnName))));
 					} else if(allFields == null && FilterFieldUtils.FILETERS_USER_NAME.contains(columnName)) {
-						result.add(DecryptUtils.dataSecurityProcessUserName(resultSet.getString(columnName)));
+						result.add(DecryptUtils.dataSecurityProcessUserName(resultSet.getString(i+1)));
 					} else {
 						result.add("******");
 						if(needDecryptByEnt && isPhoneNumber(columnName)){
 							//导出数据中需要增加加密列,先解密再加密
-							String value = DecryptUtils.getInstance().decrypt(resultSet.getString(columnName));
+							String value = DecryptUtils.getInstance().decrypt(resultSet.getString(i+1));
 							if(org.apache.commons.lang3.StringUtils.isNotBlank(value)){
 								byte[] bytes = rsa.encrypt(StrUtil.bytes(value, CharsetUtil.UTF_8), KeyType.PublicKey);
 								String encode = Base64.encode(bytes);
@@ -171,7 +171,7 @@ public class CsvResultSetHelper implements ResultSetHelper {
 					}
 				} else if (doDecrypt) { // 如果需要解密处理
 					//System.out.println("CSV 解密字段名 " + columnName);
-					String tmpResult = resultSet.getString(columnName);
+					String tmpResult = resultSet.getString(i+1);
 					if (tmpResult != null && tmpResult.length() > 0) {
 						//tmpResult = DecryptUtils.getInstance().decrypt(tmpResult);
 						tmpResult = DecryptUtils.getInstance().decrypt(tmpResult);
@@ -181,17 +181,17 @@ public class CsvResultSetHelper implements ResultSetHelper {
 					int columnType = resultSet.getMetaData().getColumnType(i + 1);
 					switch (columnType) {
 						case Types.TIMESTAMP:
-							result.add(resultSet.getTimestamp(columnName) != null ? datetimeFormatter.format(resultSet.getTimestamp(columnName)) : "");
+							result.add(resultSet.getTimestamp(i+1) != null ? datetimeFormatter.format(resultSet.getTimestamp(i+1)) : "");
 							break;
 						case Types.DATE:
 							//result[i] = resultSet.getTimestamp(columnName) != null ? dateFormatter.format(resultSet.getTimestamp(columnName)) : "";
-							result.add(resultSet.getDate(columnName) != null ? dateFormatter.format(resultSet.getDate(columnName)) : "");
+							result.add(resultSet.getDate(i+1) != null ? dateFormatter.format(resultSet.getDate(i+1)) : "");
 							break;
 						case Types.TIME:
-							result.add(resultSet.getTimestamp(columnName) != null ? timeFormatter.format(resultSet.getTimestamp(columnName)) : "");
+							result.add(resultSet.getTimestamp(i+1) != null ? timeFormatter.format(resultSet.getTimestamp(i+1)) : "");
 							break;
 						default:
-							result.add(String.valueOf(resultSet.getObject(columnName)));
+							result.add(String.valueOf(resultSet.getObject(i+1)));
 							break;
 					} // SWITCH OVER
 				} // IF ELSE OVER

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

@@ -438,7 +438,7 @@ public class FreeQueryServiceImpl implements IFreeQueryService {
 										Row row = sheet.createRow(0);
 										Cell cell;
 										for (int j = 0; j < rs.getMetaData().getColumnCount(); ++j) { // 遍历创建表头
-											String colName = rs.getMetaData().getColumnLabel(j + 1);
+											String colName = rs.getMetaData().getColumnName(j + 1);
 											cell = row.createCell(j);
 											cell.setCellValue(colName);
 										}