From 735273d69f9ea6986cda5731eda6947e81e552f8 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 22 Mar 2024 16:44:18 +0800
Subject: [PATCH] Excel注解ColumnType类型新增文本
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
index 1c87e75..2176e12 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.math.RoundingMode;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.text.NumberFormat;
@@ -313,7 +314,7 @@
* 转换为Integer数组<br>
*
* @param split 分隔符
- * @param split 被转换的值
+ * @param str 被转换的值
* @return 结果
*/
public static Integer[] toIntArray(String split, String str)
@@ -370,7 +371,7 @@
* 转换为String数组<br>
*
* @param split 分隔符
- * @param split 被转换的值
+ * @param str 被转换的值
* @return 结果
*/
public static String[] toStrArray(String split, String str)
@@ -561,17 +562,12 @@
switch (valueStr)
{
case "true":
- return true;
- case "false":
- return false;
case "yes":
- return true;
case "ok":
- return true;
- case "no":
- return false;
case "1":
return true;
+ case "false":
+ case "no":
case "0":
return false;
default:
@@ -717,7 +713,7 @@
}
if (value instanceof Double)
{
- return new BigDecimal((Double) value);
+ return BigDecimal.valueOf((Double) value);
}
if (value instanceof Integer)
{
@@ -797,7 +793,21 @@
}
else if (obj instanceof byte[] || obj instanceof Byte[])
{
- return str((Byte[]) obj, charset);
+ if (obj instanceof byte[])
+ {
+ return str((byte[]) obj, charset);
+ }
+ else
+ {
+ Byte[] bytes = (Byte[]) obj;
+ int length = bytes.length;
+ byte[] dest = new byte[length];
+ for (int i = 0; i < length; i++)
+ {
+ dest[i] = bytes[i];
+ }
+ return str(dest, charset);
+ }
}
else if (obj instanceof ByteBuffer)
{
@@ -893,7 +903,7 @@
*/
public static String toSBC(String input, Set<Character> notConvertSet)
{
- char c[] = input.toCharArray();
+ char[] c = input.toCharArray();
for (int i = 0; i < c.length; i++)
{
if (null != notConvertSet && notConvertSet.contains(c[i]))
@@ -935,7 +945,7 @@
*/
public static String toDBC(String text, Set<Character> notConvertSet)
{
- char c[] = text.toCharArray();
+ char[] c = text.toCharArray();
for (int i = 0; i < c.length; i++)
{
if (null != notConvertSet && notConvertSet.contains(c[i]))
@@ -953,9 +963,7 @@
c[i] = (char) (c[i] - 65248);
}
}
- String returnString = new String(c);
-
- return returnString;
+ return new String(c);
}
/**
@@ -976,7 +984,12 @@
String s = "";
for (int i = 0; i < fraction.length; i++)
{
- s += (digit[(int) (Math.floor(n * 10 * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", "");
+ // 优化double计算精度丢失问题
+ BigDecimal nNum = new BigDecimal(n);
+ BigDecimal decimal = new BigDecimal(10);
+ BigDecimal scale = nNum.multiply(decimal).setScale(2, RoundingMode.HALF_EVEN);
+ double d = scale.doubleValue();
+ s += (digit[(int) (Math.floor(d * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", "");
}
if (s.length() < 1)
{
--
Gitblit v1.9.3