修复电话等长数字可能出现科学计数法的问题 #583

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.alibaba</groupId>
     <artifactId>easyexcel</artifactId>
-    <version>2.0.0-beta6</version>
+    <version>2.0.0</version>
     <packaging>jar</packaging>
     <name>easyexcel</name>
 

quickstart.md

@@ -8,7 +8,7 @@
 * 读取图片
 * 宏
 #### 关于版本兼容
-目前poi用的 4.0.1 建议检查是否该版本。如果出现找不到class之类的，八成就是这个原因。
+目前poi用的 4.0.1 建议检查是否该版本。如果看到`NoClassDefFoundError`或者`ClassNotFoundException`，请查看poi相关版本是否都为4.0.1。
 #### 详细参数介绍
 有些参数不知道怎么用，或者有些功能不知道用什么参数，参照：[详细参数介绍](/docs/API.md)
 #### 开源项目不容易，如果觉得本项目对您的工作还是有帮助的话，请在右上角帮忙点个★Star。

src/main/java/com/alibaba/excel/analysis/v03/handlers/FormulaRecordHandler.java

@@ -1,5 +1,7 @@
 package com.alibaba.excel.analysis.v03.handlers;
 
+import java.math.BigDecimal;
+
 import org.apache.poi.hssf.eventusermodel.FormatTrackingHSSFListener;
 import org.apache.poi.hssf.model.HSSFFormulaParser;
 import org.apache.poi.hssf.record.FormulaRecord;
@@ -66,7 +68,7 @@ public class FormulaRecordHandler extends AbstractXlsRecordHandler {
                     tempCellData.setFormulaValue(formulaValue);
                     break;
                 case NUMERIC:
-                    this.cellData = new CellData(frec.getValue());
+                    this.cellData = new CellData(BigDecimal.valueOf(frec.getValue()));
                     this.cellData.setFormula(Boolean.TRUE);
                     this.cellData.setFormulaValue(formulaValue);
                     break;

src/main/java/com/alibaba/excel/analysis/v03/handlers/NumberRecordHandler.java

@@ -1,5 +1,7 @@
 package com.alibaba.excel.analysis.v03.handlers;
 
+import java.math.BigDecimal;
+
 import org.apache.poi.hssf.eventusermodel.FormatTrackingHSSFListener;
 import org.apache.poi.hssf.record.NumberRecord;
 import org.apache.poi.hssf.record.Record;
@@ -29,7 +31,7 @@ public class NumberRecordHandler extends AbstractXlsRecordHandler {
         NumberRecord numrec = (NumberRecord)record;
         this.row = numrec.getRow();
         this.column = numrec.getColumn();
-        this.cellData = new CellData(numrec.getValue());
+        this.cellData = new CellData(BigDecimal.valueOf(numrec.getValue()));
         this.cellData.setDataFormat(formatListener.getFormatIndex(numrec));
         this.cellData.setDataFormatString(formatListener.getFormatString(numrec));
     }

src/main/java/com/alibaba/excel/analysis/v07/handlers/DefaultCellHandler.java

@@ -7,6 +7,7 @@ import static com.alibaba.excel.constant.ExcelXmlConstants.CELL_TAG;
 import static com.alibaba.excel.constant.ExcelXmlConstants.CELL_VALUE_TAG;
 import static com.alibaba.excel.constant.ExcelXmlConstants.CELL_VALUE_TYPE_TAG;
 
+import java.math.BigDecimal;
 import java.util.Deque;
 import java.util.LinkedList;
 import java.util.Map;
@@ -164,8 +165,8 @@ public class DefaultCellHandler implements XlsxCellHandler, XlsxRowResultHolder
             case NUMBER:
             case EMPTY:
                 currentCellData.setType(CellDataTypeEnum.NUMBER);
-                if (currentCellData.getDoubleValue() == null) {
-                    currentCellData.setDoubleValue(Double.valueOf(currentCellValue));
+                if (currentCellData.getNumberValue() == null) {
+                    currentCellData.setNumberValue(new BigDecimal(currentCellValue));
                 }
                 break;
             default:

src/main/java/com/alibaba/excel/converters/bigdecimal/BigDecimalNumberConverter.java

@@ -28,12 +28,12 @@ public class BigDecimalNumberConverter implements Converter<BigDecimal> {
     @Override
     public BigDecimal convertToJavaData(CellData cellData, ExcelContentProperty contentProperty,
         GlobalConfiguration globalConfiguration) {
-        return BigDecimal.valueOf(cellData.getDoubleValue());
+        return cellData.getNumberValue();
     }
 
     @Override
     public CellData convertToExcelData(BigDecimal value, ExcelContentProperty contentProperty,
         GlobalConfiguration globalConfiguration) {
-        return new CellData(value.doubleValue());
+        return new CellData(value);
     }
 }

src/main/java/com/alibaba/excel/converters/booleanconverter/BooleanNumberConverter.java

@@ -1,5 +1,7 @@
 package com.alibaba.excel.converters.booleanconverter;
 
+import java.math.BigDecimal;
+
 import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.enums.CellDataTypeEnum;
 import com.alibaba.excel.metadata.CellData;
@@ -12,10 +14,6 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
  * @author Jiaju Zhuang
  */
 public class BooleanNumberConverter implements Converter<Boolean> {
-
-    private static final Double ONE = 1.0;
-    private static final Double ZERO = 0.0;
-
     @Override
     public Class supportJavaTypeKey() {
         return Boolean.class;
@@ -29,7 +27,7 @@ public class BooleanNumberConverter implements Converter<Boolean> {
     @Override
     public Boolean convertToJavaData(CellData cellData, ExcelContentProperty contentProperty,
         GlobalConfiguration globalConfiguration) {
-        if (ONE.equals(cellData.getDoubleValue())) {
+        if (BigDecimal.ONE.equals(cellData.getNumberValue())) {
             return Boolean.TRUE;
         }
         return Boolean.FALSE;
@@ -39,9 +37,9 @@ public class BooleanNumberConverter implements Converter<Boolean> {
     public CellData convertToExcelData(Boolean value, ExcelContentProperty contentProperty,
         GlobalConfiguration globalConfiguration) {
         if (value) {
-            return new CellData(ONE);
+            return new CellData(BigDecimal.ONE);
         }
-        return new CellData(ZERO);
+        return new CellData(BigDecimal.ZERO);
     }
 
 }

src/main/java/com/alibaba/excel/converters/byteconverter/ByteNumberConverter.java

@@ -1,5 +1,7 @@
 package com.alibaba.excel.converters.byteconverter;
 
+import java.math.BigDecimal;
+
 import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.enums.CellDataTypeEnum;
 import com.alibaba.excel.metadata.CellData;
@@ -26,13 +28,13 @@ public class ByteNumberConverter implements Converter<Byte> {
     @Override
     public Byte convertToJavaData(CellData cellData, ExcelContentProperty contentProperty,
         GlobalConfiguration globalConfiguration) {
-        return cellData.getDoubleValue().byteValue();
+        return cellData.getNumberValue().byteValue();
     }
 
     @Override
     public CellData convertToExcelData(Byte value, ExcelContentProperty contentProperty,
         GlobalConfiguration globalConfiguration) {
-        return new CellData(value.doubleValue());
+        return new CellData(BigDecimal.valueOf(value));
     }
 
 }

src/main/java/com/alibaba/excel/converters/date/DateNumberConverter.java

@@ -1,8 +1,9 @@
 package com.alibaba.excel.converters.date;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
-import org.apache.poi.hssf.usermodel.HSSFDateUtil;
+import org.apache.poi.ss.usermodel.DateUtil;
 
 import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.enums.CellDataTypeEnum;
@@ -31,9 +32,10 @@ public class DateNumberConverter implements Converter<Date> {
     public Date convertToJavaData(CellData cellData, ExcelContentProperty contentProperty,
         GlobalConfiguration globalConfiguration) {
         if (contentProperty == null || contentProperty.getDateTimeFormatProperty() == null) {
-            return HSSFDateUtil.getJavaDate(cellData.getDoubleValue(), globalConfiguration.getUse1904windowing(), null);
+            return DateUtil.getJavaDate(cellData.getNumberValue().doubleValue(),
+                globalConfiguration.getUse1904windowing(), null);
         } else {
-            return HSSFDateUtil.getJavaDate(cellData.getDoubleValue(),
+            return DateUtil.getJavaDate(cellData.getNumberValue().doubleValue(),
                 contentProperty.getDateTimeFormatProperty().getUse1904windowing(), null);
         }
     }
@@ -41,6 +43,12 @@ public class DateNumberConverter implements Converter<Date> {
     @Override
     public CellData convertToExcelData(Date value, ExcelContentProperty contentProperty,
         GlobalConfiguration globalConfiguration) {
-        return new CellData((double)(value.getTime()));
+        if (contentProperty == null || contentProperty.getDateTimeFormatProperty() == null) {
+            return new CellData(
+                BigDecimal.valueOf(DateUtil.getExcelDate(value, globalConfiguration.getUse1904windowing())));
+        } else {
+            return new CellData(BigDecimal.valueOf(
+                DateUtil.getExcelDate(value, contentProperty.getDateTimeFormatProperty().getUse1904windowing())));
+        }
     }
 }

src/main/java/com/alibaba/excel/converters/doubleconverter/DoubleNumberConverter.java

@@ -1,5 +1,7 @@
 package com.alibaba.excel.converters.doubleconverter;
 
+import java.math.BigDecimal;
+
 import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.enums.CellDataTypeEnum;
 import com.alibaba.excel.metadata.CellData;
@@ -26,13 +28,13 @@ public class DoubleNumberConverter implements Converter<Double> {
     @Override
     public Double convertToJavaData(CellData cellData, ExcelContentProperty contentProperty,
         GlobalConfiguration globalConfiguration) {
-        return cellData.getDoubleValue();
+        return cellData.getNumberValue().doubleValue();
     }
 
     @Override
     public CellData convertToExcelData(Double value, ExcelContentProperty contentProperty,
         GlobalConfiguration globalConfiguration) {
-        return new CellData(value);
+        return new CellData(BigDecimal.valueOf(value));
     }
 
 }

src/main/java/com/alibaba/excel/converters/floatconverter/FloatNumberConverter.java

@@ -1,5 +1,7 @@
 package com.alibaba.excel.converters.floatconverter;
 
+import java.math.BigDecimal;
+
 import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.enums.CellDataTypeEnum;
 import com.alibaba.excel.metadata.CellData;
@@ -26,13 +28,13 @@ public class FloatNumberConverter implements Converter<Float> {
     @Override
     public Float convertToJavaData(CellData cellData, ExcelContentProperty contentProperty,
         GlobalConfiguration globalConfiguration) {
-        return cellData.getDoubleValue().floatValue();
+        return cellData.getNumberValue().floatValue();
     }
 
     @Override
     public CellData convertToExcelData(Float value, ExcelContentProperty contentProperty,
         GlobalConfiguration globalConfiguration) {
-        return new CellData(value.doubleValue());
+        return new CellData(BigDecimal.valueOf(value));
     }
 
 }

src/main/java/com/alibaba/excel/converters/integer/IntegerNumberConverter.java

@@ -1,5 +1,7 @@
 package com.alibaba.excel.converters.integer;
 
+import java.math.BigDecimal;
+
 import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.enums.CellDataTypeEnum;
 import com.alibaba.excel.metadata.CellData;
@@ -26,13 +28,13 @@ public class IntegerNumberConverter implements Converter<Integer> {
     @Override
     public Integer convertToJavaData(CellData cellData, ExcelContentProperty contentProperty,
         GlobalConfiguration globalConfiguration) {
-        return cellData.getDoubleValue().intValue();
+        return cellData.getNumberValue().intValue();
     }
 
     @Override
     public CellData convertToExcelData(Integer value, ExcelContentProperty contentProperty,
         GlobalConfiguration globalConfiguration) {
-        return new CellData(value.doubleValue());
+        return new CellData(BigDecimal.valueOf(value));
     }
 
 }

src/main/java/com/alibaba/excel/converters/longconverter/LongNumberConverter.java

@@ -1,5 +1,7 @@
 package com.alibaba.excel.converters.longconverter;
 
+import java.math.BigDecimal;
+
 import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.enums.CellDataTypeEnum;
 import com.alibaba.excel.metadata.CellData;
@@ -26,13 +28,13 @@ public class LongNumberConverter implements Converter<Long> {
     @Override
     public Long convertToJavaData(CellData cellData, ExcelContentProperty contentProperty,
         GlobalConfiguration globalConfiguration) {
-        return cellData.getDoubleValue().longValue();
+        return cellData.getNumberValue().longValue();
     }
 
     @Override
     public CellData convertToExcelData(Long value, ExcelContentProperty contentProperty,
         GlobalConfiguration globalConfiguration) {
-        return new CellData(value.doubleValue());
+        return new CellData(BigDecimal.valueOf(value));
     }
 
 }

src/main/java/com/alibaba/excel/converters/shortconverter/ShortNumberConverter.java

@@ -1,5 +1,7 @@
 package com.alibaba.excel.converters.shortconverter;
 
+import java.math.BigDecimal;
+
 import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.enums.CellDataTypeEnum;
 import com.alibaba.excel.metadata.CellData;
@@ -26,13 +28,13 @@ public class ShortNumberConverter implements Converter<Short> {
     @Override
     public Short convertToJavaData(CellData cellData, ExcelContentProperty contentProperty,
         GlobalConfiguration globalConfiguration) {
-        return cellData.getDoubleValue().shortValue();
+        return cellData.getNumberValue().shortValue();
     }
 
     @Override
     public CellData convertToExcelData(Short value, ExcelContentProperty contentProperty,
         GlobalConfiguration globalConfiguration) {
-        return new CellData(value.doubleValue());
+        return new CellData(BigDecimal.valueOf(value));
     }
 
 }

src/main/java/com/alibaba/excel/converters/string/StringNumberConverter.java

@@ -1,6 +1,7 @@
 package com.alibaba.excel.converters.string;
 
-import org.apache.poi.hssf.usermodel.HSSFDateUtil;
+import java.math.BigDecimal;
+
 import org.apache.poi.ss.usermodel.DateUtil;
 
 import com.alibaba.excel.converters.Converter;
@@ -34,30 +35,30 @@ public class StringNumberConverter implements Converter<String> {
         // If there are "DateTimeFormat", read as date
         if (contentProperty != null && contentProperty.getDateTimeFormatProperty() != null) {
             return DateUtils.format(
-                HSSFDateUtil.getJavaDate(cellData.getDoubleValue(),
+                DateUtil.getJavaDate(cellData.getNumberValue().doubleValue(),
                     contentProperty.getDateTimeFormatProperty().getUse1904windowing(), null),
                 contentProperty.getDateTimeFormatProperty().getFormat());
         }
         // If there are "NumberFormat", read as number
         if (contentProperty != null && contentProperty.getNumberFormatProperty() != null) {
-            return NumberUtils.format(cellData.getDoubleValue(), contentProperty);
+            return NumberUtils.format(cellData.getNumberValue(), contentProperty);
         }
         // Excel defines formatting
         if (cellData.getDataFormat() != null) {
             if (DateUtil.isADateFormat(cellData.getDataFormat(), cellData.getDataFormatString())) {
-                return DateUtils.format(HSSFDateUtil.getJavaDate(cellData.getDoubleValue(),
+                return DateUtils.format(DateUtil.getJavaDate(cellData.getNumberValue().doubleValue(),
                     globalConfiguration.getUse1904windowing(), null));
             } else {
-                return NumberUtils.format(cellData.getDoubleValue(), contentProperty);
+                return NumberUtils.format(cellData.getNumberValue(), contentProperty);
             }
         }
         // Default conversion number
-        return NumberUtils.format(cellData.getDoubleValue(), contentProperty);
+        return NumberUtils.format(cellData.getNumberValue(), contentProperty);
     }
 
     @Override
     public CellData convertToExcelData(String value, ExcelContentProperty contentProperty,
         GlobalConfiguration globalConfiguration) {
-        return new CellData(Double.valueOf(value));
+        return new CellData(new BigDecimal(value));
     }
 }

src/main/java/com/alibaba/excel/metadata/CellData.java

@@ -1,5 +1,7 @@
 package com.alibaba.excel.metadata;
 
+import java.math.BigDecimal;
+
 import com.alibaba.excel.enums.CellDataTypeEnum;
 import com.alibaba.excel.util.StringUtils;
 
@@ -13,7 +15,7 @@ public class CellData {
     /**
      * {@link CellDataTypeEnum#NUMBER}
      */
-    private Double doubleValue;
+    private BigDecimal numberValue;
     /**
      * {@link CellDataTypeEnum#STRING} and{@link CellDataTypeEnum#ERROR}
      */
@@ -36,7 +38,7 @@ public class CellData {
 
     public CellData(CellData other) {
         this.type = other.type;
-        this.doubleValue = other.doubleValue;
+        this.numberValue = other.numberValue;
         this.stringValue = other.stringValue;
         this.booleanValue = other.booleanValue;
         this.formula = other.formula;
@@ -62,12 +64,12 @@ public class CellData {
         this.formula = Boolean.FALSE;
     }
 
-    public CellData(Double doubleValue) {
-        if (doubleValue == null) {
+    public CellData(BigDecimal numberValue) {
+        if (numberValue == null) {
             throw new IllegalArgumentException("DoubleValue can not be null");
         }
         this.type = CellDataTypeEnum.NUMBER;
-        this.doubleValue = doubleValue;
+        this.numberValue = numberValue;
         this.formula = Boolean.FALSE;
     }
 
@@ -105,12 +107,12 @@ public class CellData {
         this.type = type;
     }
 
-    public Double getDoubleValue() {
-        return doubleValue;
+    public BigDecimal getNumberValue() {
+        return numberValue;
     }
 
-    public void setDoubleValue(Double doubleValue) {
-        this.doubleValue = doubleValue;
+    public void setNumberValue(BigDecimal numberValue) {
+        this.numberValue = numberValue;
     }
 
     public String getStringValue() {
@@ -181,7 +183,7 @@ public class CellData {
                 }
                 return;
             case NUMBER:
-                if (doubleValue == null) {
+                if (numberValue == null) {
                     type = CellDataTypeEnum.EMPTY;
                 }
                 return;
@@ -198,7 +200,7 @@ public class CellData {
     public String toString() {
         switch (type) {
             case NUMBER:
-                return doubleValue.toString();
+                return numberValue.toString();
             case BOOLEAN:
                 return booleanValue.toString();
             case STRING:

src/main/java/com/alibaba/excel/write/ExcelBuilderImpl.java

@@ -312,7 +312,7 @@ public class ExcelBuilderImpl implements ExcelBuilder {
                 cell.setCellValue(cellData.getBooleanValue());
                 return cellData;
             case NUMBER:
-                cell.setCellValue(cellData.getDoubleValue());
+                cell.setCellValue(cellData.getNumberValue().doubleValue());
                 return cellData;
             case IMAGE:
                 setImageValue(cellData, cell);

src/main/java/com/alibaba/excel/write/style/column/LongestMatchColumnWidthStyleStrategy.java

@@ -58,7 +58,7 @@ public class LongestMatchColumnWidthStyleStrategy extends AbstractColumnWidthSty
             case BOOLEAN:
                 return cellData.getBooleanValue().toString().getBytes().length;
             case NUMBER:
-                return cellData.getDoubleValue().toString().getBytes().length;
+                return cellData.getNumberValue().toString().getBytes().length;
             default:
                 return -1;
         }

src/test/java/com/alibaba/easyexcel/test/temp/simple/HgTest.java

@@ -24,7 +24,7 @@ public class HgTest {
     @Test
     public void hh() throws IOException {
         List<Object> list =
-            EasyExcel.read(new FileInputStream("D:\\test\\商户不匹配工单信息收集表格.xlsx")).headRowNumber(0).sheet().doReadSync();
+            EasyExcel.read(new FileInputStream("D:\\test\\number.xlsx")).headRowNumber(0).sheet().doReadSync();
         for (Object data : list) {
             LOGGER.info("返回数据：{}", JSON.toJSONString(data));
         }

update.md

@@ -1,3 +1,8 @@
+# 2.0.0
+* 修复当cell为空可能会抛出空指针的bug
+* 修复电话等长数字可能出现科学计数法的问题 [Issue #583](https://github.com/alibaba/easyexcel/issues/583)
+* 升级为正式版
+
 # 2.0.0-beta6
 * 修复空行读取空指针异常
 * 修复写入指定头为List<List<String>>,但是数据用List<Class>导致的空指针