Merge branch 'fix/gson转double数据类型数据失真' into 'wrdp'

[平台]处理gson转double数据类型数据失真的问题

See merge request o2oa/o2oa!3060

o2server/x_base_core_project/src/main/java/com/x/base/core/project/gson/DoubleDeserializer.java

@@ -15,8 +15,13 @@ public class DoubleDeserializer implements JsonDeserializer<Double> {
 	@Override
 	public Double deserialize(JsonElement json, Type type, JsonDeserializationContext context)
 			throws JsonParseException {
-		Number num = NumberUtils.createNumber(StringUtils.trimToNull(json.getAsString()));
-		return (num == null) ? null : num.doubleValue();
+		/*Number num = NumberUtils.createNumber(StringUtils.trimToNull(json.getAsString()));
+		return (num == null) ? null : num.doubleValue();*/
+		if(StringUtils.isBlank(json.getAsString())){
+			return null;
+		}else{
+			return Double.parseDouble(StringUtils.trim(json.getAsString()));
+		}
 	}
 
-}
+}

o2server/x_base_core_project/src/main/java/com/x/base/core/project/gson/FloatDeserializer.java

@@ -15,8 +15,13 @@ public class FloatDeserializer implements JsonDeserializer<Float> {
 	@Override
 	public Float deserialize(JsonElement json, Type type, JsonDeserializationContext context)
 			throws JsonParseException {
-		Number num = NumberUtils.createNumber(StringUtils.trimToNull(json.getAsString()));
-		return (num == null) ? null : num.floatValue();
+		/*Number num = NumberUtils.createNumber(StringUtils.trimToNull(json.getAsString()));
+		return (num == null) ? null : num.floatValue();*/
+		if(StringUtils.isBlank(json.getAsString())){
+			return null;
+		}else{
+			return Float.parseFloat(StringUtils.trim(json.getAsString()));
+		}
 	}
 
-}
+}