Merge branch 'developer' into 'master'

取数平台调整

See merge request !40

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

@@ -38,6 +38,11 @@ public class DecryptUtils {
 	public static String decrypt(String encryptString) {
 		try {
 			String result = decryptionClient.decrypt(encryptString);
+			if(org.apache.commons.lang.StringUtils.isNotBlank(result)){
+				if(result.contains("E0")){
+					return result+"\t";
+				}
+			}
 			return result;
 		} catch (DecryptException e) {
 			e.printStackTrace();

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

@@ -191,7 +191,13 @@ public class CsvResultSetHelper implements ResultSetHelper {
 							result.add(resultSet.getTimestamp(i+1) != null ? timeFormatter.format(resultSet.getTimestamp(i+1)) : "");
 							break;
 						default:
-							result.add(String.valueOf(resultSet.getObject(i+1)));
+							String s2 = String.valueOf(resultSet.getObject(i + 1));
+							if(org.apache.commons.lang3.StringUtils.isNotBlank(s2)){
+								if(s2.contains("E0")){
+									s2 = s2 + "\t";
+								}
+							}
+							result.add(s2);
 							break;
 					} // SWITCH OVER
 				} // IF ELSE OVER

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

@@ -471,7 +471,13 @@ public class FreeQueryServiceImpl implements IFreeQueryService {
 															row.createCell(j).setCellValue(rs.getTimestamp(j + 1) != null ? timeFormatter.format(rs.getTimestamp(j + 1)) : "");
 															break;
 														default:
-															row.createCell(j).setCellValue(rs.getString(j + 1));
+															String string = rs.getString(j + 1);
+															if(StringUtils.isNotBlank(string)){
+																if(string.contains("E0")){
+																	string = string + "\t";
+																}
+															}
+															row.createCell(j).setCellValue(string);
 															break;
 													}
 												}