fix(转换工具): 超大精度的数字转换返回BigDecimal类型 (#22)

jetlinks · Aug 1, 2024 · e4a3d9a · e4a3d9a
1 parent af30e4c
commit e4a3d9a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -271,7 +271,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.6.0</version>
+            <version>5.8.2</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/src/main/java/org/jetlinks/reactor/ql/utils/CastUtils.java b/src/main/java/org/jetlinks/reactor/ql/utils/CastUtils.java
@@ -158,6 +158,9 @@ public static Number castNumber(Object value, Function<Object, Number> fallback)
             }
             try {
                 BigDecimal decimal = new BigDecimal(stringValue);
+                if (decimal.precision() >= 17) {
+                    return decimal;
+                }
                 if (decimal.scale() == 0) {
                     return decimal.longValue();
                 }

diff --git a/src/test/java/org/jetlinks/reactor/ql/utils/CastUtilsTest.java b/src/test/java/org/jetlinks/reactor/ql/utils/CastUtilsTest.java
@@ -5,6 +5,7 @@
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
 
+import java.math.BigDecimal;
 import java.time.*;
 import java.time.temporal.ChronoField;
 import java.util.*;
@@ -70,7 +71,7 @@ void testCollection() {
         assertEquals(CastUtils.castCollection(new Object[]{1, 2, 3}, new ArrayList<>()),
                      Arrays.asList(1, 2, 3));
 
-        assertEquals(CastUtils.castCollection(1,new ArrayList<>()), Collections.singletonList(1));
+        assertEquals(CastUtils.castCollection(1, new ArrayList<>()), Collections.singletonList(1));
 
     }
 
@@ -153,6 +154,20 @@ void testCastNumber() {
                                                     Number.class::cast,
                                                     Number.class::cast
         ));
+        assertInstanceOf(BigDecimal.class, CastUtils.castNumber("1000000000000000000000000000000000"));
+        assertInstanceOf(Long.class, CastUtils.castNumber("1000000000000000"));
+        assertInstanceOf(Double.class, CastUtils.castNumber("0.000000000000000000000000000000001"));
+        assertInstanceOf(BigDecimal.class, CastUtils.castNumber("111111111111111111111111111111111.123"));
+        assertInstanceOf(Double.class, CastUtils.castNumber("1111111111111.123"));
+
+        assertEquals(new BigDecimal("1000000000000000000000000000000000"),
+                     CastUtils.castNumber("1000000000000000000000000000000000"));
+
+        assertEquals(new Double("0.000000000000000000000000000000001"),
+                     CastUtils.castNumber("0.000000000000000000000000000000001"));
+
+        assertEquals(new BigDecimal("111111111111111111111111111111111.123"),
+                     CastUtils.castNumber("111111111111111111111111111111111.123"));
     }
 
     @Test