Merge branch 'alibaba:master' into issue1651

zjr2000 · May 9, 2021 · f8642ce · f8642ce
2 parents d3d4979 + e483b0b
commit f8642ce
Show file tree

Hide file tree

Showing 13 changed files with 68 additions and 23 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba</groupId>
     <artifactId>easyexcel</artifactId>
-    <version>2.2.7</version>
+    <version>2.2.9</version>
     <packaging>jar</packaging>
     <name>easyexcel</name>
 

diff --git a/src/main/java/com/alibaba/excel/analysis/v07/handlers/AbstractCellValueTagHandler.java b/src/main/java/com/alibaba/excel/analysis/v07/handlers/AbstractCellValueTagHandler.java
@@ -7,6 +7,7 @@
 import com.alibaba.excel.metadata.CellData;
 import com.alibaba.excel.read.metadata.holder.xlsx.XlsxReadSheetHolder;
 import com.alibaba.excel.util.BooleanUtils;
+import com.alibaba.excel.util.StringUtils;
 
 /**
  * Cell Value Handler
@@ -20,6 +21,7 @@ public void endElement(XlsxReadContext xlsxReadContext, String name) {
         XlsxReadSheetHolder xlsxReadSheetHolder = xlsxReadContext.xlsxReadSheetHolder();
         CellData tempCellData = xlsxReadSheetHolder.getTempCellData();
         StringBuilder tempData = xlsxReadSheetHolder.getTempData();
+        String tempDataString = tempData.toString();
         CellDataTypeEnum oldType = tempCellData.getType();
         switch (oldType) {
             case DIRECT_STRING:
@@ -28,10 +30,18 @@ public void endElement(XlsxReadContext xlsxReadContext, String name) {
                 tempCellData.setStringValue(tempData.toString());
                 break;
             case BOOLEAN:
+                if(StringUtils.isEmpty(tempDataString)){
+                    tempCellData.setType(CellDataTypeEnum.EMPTY);
+                    break;
+                }
                 tempCellData.setBooleanValue(BooleanUtils.valueOf(tempData.toString()));
                 break;
             case NUMBER:
             case EMPTY:
+                if(StringUtils.isEmpty(tempDataString)){
+                    tempCellData.setType(CellDataTypeEnum.EMPTY);
+                    break;
+                }
                 tempCellData.setType(CellDataTypeEnum.NUMBER);
                 tempCellData.setNumberValue(new BigDecimal(tempData.toString()));
                 break;

diff --git a/src/main/java/com/alibaba/excel/analysis/v07/handlers/CellValueTagHandler.java b/src/main/java/com/alibaba/excel/analysis/v07/handlers/CellValueTagHandler.java
@@ -3,6 +3,7 @@
 import com.alibaba.excel.context.xlsx.XlsxReadContext;
 import com.alibaba.excel.enums.CellDataTypeEnum;
 import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.util.StringUtils;
 
 /**
  * Cell Value Handler
@@ -17,6 +18,10 @@ protected void setStringValue(XlsxReadContext xlsxReadContext) {
         CellData tempCellData = xlsxReadContext.xlsxReadSheetHolder().getTempCellData();
         switch (tempCellData.getType()) {
             case STRING:
+                // In some cases, although cell type is a string, it may be an empty tag
+                if(StringUtils.isEmpty(tempCellData.getStringValue())){
+                    break;
+                }
                 String stringValue = xlsxReadContext.readWorkbookHolder().getReadCache()
                     .get(Integer.valueOf(tempCellData.getStringValue()));
                 if (stringValue != null && xlsxReadContext.currentReadHolder().globalConfiguration().getAutoTrim()) {

diff --git a/src/main/java/com/alibaba/excel/converters/string/StringNumberConverter.java b/src/main/java/com/alibaba/excel/converters/string/StringNumberConverter.java
@@ -47,7 +47,7 @@ public String convertToJavaData(CellData cellData, ExcelContentProperty contentP
         }
         // Excel defines formatting
         if (cellData.getDataFormat() != null && !StringUtils.isEmpty(cellData.getDataFormatString())) {
-            return NumberDataFormatterUtils.format(cellData.getNumberValue().doubleValue(), cellData.getDataFormat(),
+            return NumberDataFormatterUtils.format(cellData.getNumberValue(), cellData.getDataFormat(),
                 cellData.getDataFormatString(), globalConfiguration);
         }
         // Default conversion number

diff --git a/src/main/java/com/alibaba/excel/metadata/format/DataFormatter.java b/src/main/java/com/alibaba/excel/metadata/format/DataFormatter.java
@@ -630,8 +630,8 @@ private String getFormattedDateString(Double data, Integer dataFormat, String da
      * @param dataFormatString
      * @return a formatted number string
      */
-    private String getFormattedNumberString(Double data, Integer dataFormat, String dataFormatString) {
-        Format numberFormat = getFormat(data, dataFormat, dataFormatString);
+    private String getFormattedNumberString(BigDecimal data, Integer dataFormat, String dataFormatString) {
+        Format numberFormat = getFormat(data.doubleValue(), dataFormat, dataFormatString);
         String formatted = numberFormat.format(data);
         return formatted.replaceFirst("E(\\d)", "E+$1"); // to match Excel's E-notation
     }
@@ -644,9 +644,9 @@ private String getFormattedNumberString(Double data, Integer dataFormat, String
      * @param dataFormatString
      * @return
      */
-    public String format(Double data, Integer dataFormat, String dataFormatString) {
+    public String format(BigDecimal data, Integer dataFormat, String dataFormatString) {
         if (DateUtils.isADateFormat(dataFormat, dataFormatString)) {
-            return getFormattedDateString(data, dataFormat, dataFormatString);
+            return getFormattedDateString(data.doubleValue(), dataFormat, dataFormatString);
         }
         return getFormattedNumberString(data, dataFormat, dataFormatString);
     }

diff --git a/src/main/java/com/alibaba/excel/util/NumberDataFormatterUtils.java b/src/main/java/com/alibaba/excel/util/NumberDataFormatterUtils.java
@@ -1,5 +1,7 @@
 package com.alibaba.excel.util;
 
+import java.math.BigDecimal;
+
 import com.alibaba.excel.metadata.format.DataFormatter;
 import com.alibaba.excel.metadata.GlobalConfiguration;
 
@@ -24,7 +26,7 @@ public class NumberDataFormatterUtils {
      * @param globalConfiguration
      * @return
      */
-    public static String format(Double data, Integer dataFormat, String dataFormatString,
+    public static String format(BigDecimal data, Integer dataFormat, String dataFormatString,
         GlobalConfiguration globalConfiguration) {
         DataFormatter dataFormatter = DATA_FORMATTER_THREAD_LOCAL.get();
         if (dataFormatter == null) {

diff --git a/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java b/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatTest.java
@@ -4,17 +4,16 @@
 import java.util.List;
 import java.util.Locale;
 
+import com.alibaba.easyexcel.test.util.TestFileUtil;
+import com.alibaba.excel.EasyExcel;
+
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.alibaba.easyexcel.test.util.TestFileUtil;
-import com.alibaba.excel.EasyExcel;
-
 /**
- *
  * @author Jiaju Zhuang
  */
 public class DateFormatTest {
@@ -44,6 +43,14 @@ public void t02Read03() {
     private void readCn(File file) {
         List<DateFormatData> list =
             EasyExcel.read(file, DateFormatData.class, null).locale(Locale.CHINA).sheet().doReadSync();
+        for (DateFormatData data : list) {
+            if (data.getDateStringCn() != null && !data.getDateStringCn().equals(data.getDate())) {
+                LOGGER.info("date:cn:{},{}", data.getDateStringCn(), data.getDate());
+            }
+            if (data.getNumberStringCn() != null && !data.getNumberStringCn().equals(data.getNumber())) {
+                LOGGER.info("number:cn{},{}", data.getNumberStringCn(), data.getNumber());
+            }
+        }
         for (DateFormatData data : list) {
             Assert.assertEquals(data.getDateStringCn(), data.getDate());
             Assert.assertEquals(data.getNumberStringCn(), data.getNumber());
@@ -53,6 +60,14 @@ private void readCn(File file) {
     private void readUs(File file) {
         List<DateFormatData> list =
             EasyExcel.read(file, DateFormatData.class, null).locale(Locale.US).sheet().doReadSync();
+        for (DateFormatData data : list) {
+            if (data.getDateStringUs() != null && !data.getDateStringUs().equals(data.getDate())) {
+                LOGGER.info("date:us:{},{}", data.getDateStringUs(), data.getDate());
+            }
+            if (data.getNumberStringUs() != null && !data.getNumberStringUs().equals(data.getNumber())) {
+                LOGGER.info("number:us{},{}", data.getNumberStringUs(), data.getNumber());
+            }
+        }
         for (DateFormatData data : list) {
             Assert.assertEquals(data.getDateStringUs(), data.getDate());
             Assert.assertEquals(data.getNumberStringUs(), data.getNumber());

diff --git a/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataTest.java b/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptDataTest.java
@@ -3,21 +3,23 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.BeforeClass;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runners.MethodSorters;
-
 import com.alibaba.easyexcel.test.core.simple.SimpleData;
 import com.alibaba.easyexcel.test.util.TestFileUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 
+import org.junit.BeforeClass;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
 /**
- *
  * @author Jiaju Zhuang
  */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -28,6 +30,15 @@ public class EncryptDataTest {
     private static File file07OutputStream;
     private static File file03OutputStream;
 
+    @Test
+    public void testformat() {
+        DecimalFormat decimalFormat = new DecimalFormat("0.00");
+        decimalFormat.setRoundingMode(RoundingMode.HALF_UP);
+        BigDecimal bigDecimal = new BigDecimal("0.105");
+
+        System.out.println(decimalFormat.format(bigDecimal));
+    }
+
     @BeforeClass
     public static void init() {
         file07 = TestFileUtil.createNewFile("encrypt07.xlsx");

diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java b/src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java
@@ -34,7 +34,7 @@ public class Lock2Test {
     @Test
     public void test() throws Exception {
 //        File file = TestFileUtil.readUserHomeFile("test/test6.xls");
-        File file = new File("D:\\test\\T85_税金入库表202010.xlsx");
+        File file = new File("/Users/zhuangjiaju/Downloads/签到金模板-0507-v3.xlsx");
 
         List<Object> list = EasyExcel.read(file).sheet(0).headRowNumber(0).doReadSync();
         LOGGER.info("数据：{}", list.size());

diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/LockTest.java b/src/test/java/com/alibaba/easyexcel/test/temp/LockTest.java
@@ -26,11 +26,7 @@ public class LockTest {
     public void test() throws Exception {
 
         List<Object> list =
-            EasyExcel.read(new FileInputStream("D:\\test\\testbug嘉惠.xlsx")).sheet().headRowNumber(0).doReadSync();
-        for (Object data : list) {
-            LOGGER.info("返回数据：{}", JSON.toJSONString(data));
-        }
-        list = EasyExcel.read(new File("D:\\test\\t222.xlsx")).sheet().headRowNumber(0).doReadSync();
+            EasyExcel.read(new FileInputStream("/Users/zhuangjiaju/Downloads/点位配置表 (1).xlsx")).doReadAllSync();
         for (Object data : list) {
             LOGGER.info("返回数据：{}", JSON.toJSONString(data));
         }

diff --git a/src/test/resources/dataformat/dataformat.xls b/src/test/resources/dataformat/dataformat.xls
diff --git a/src/test/resources/dataformat/dataformat.xlsx b/src/test/resources/dataformat/dataformat.xlsx
diff --git a/update.md b/update.md
@@ -1,3 +1,9 @@
+# 2.2.9
+* 修复读取的时候用string接收数字 可能四舍五入不一致的bug
+
+# 2.2.8
+* 兼容07在特殊的excel的情况下，读取数据异常
+
 # 2.2.7
 * 修改07在特殊情况下用`String`接收数字会丢小数位的bug