升级poi到最新版本4.1.2

@@ -28,7 +28,7 @@
         <jna.version>5.6.0</jna.version>
         <jna.version>5.6.0</jna.version>
         <commons.io.version>2.5</commons.io.version>
         <commons.io.version>2.5</commons.io.version>
         <commons.fileupload.version>1.3.3</commons.fileupload.version>
         <commons.fileupload.version>1.3.3</commons.fileupload.version>
-        <poi.version>3.17</poi.version>
+        <poi.version>4.1.2</poi.version>
         <velocity.version>1.7</velocity.version>
         <velocity.version>1.7</velocity.version>
         <jwt.version>0.9.1</jwt.version>
         <jwt.version>0.9.1</jwt.version>
     </properties>
     </properties>

@@ -18,7 +18,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Set;
 import java.util.UUID;
 import java.util.UUID;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
-import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.ss.usermodel.BorderStyle;
 import org.apache.poi.ss.usermodel.BorderStyle;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.CellStyle;
@@ -516,12 +515,10 @@ public class ExcelUtil<T>
     {
     {
         if (ColumnType.STRING == attr.cellType())
         if (ColumnType.STRING == attr.cellType())
         {
         {
-            cell.setCellType(CellType.STRING);
             cell.setCellValue(StringUtils.isNull(value) ? attr.defaultValue() : value + attr.suffix());
             cell.setCellValue(StringUtils.isNull(value) ? attr.defaultValue() : value + attr.suffix());
         }
         }
         else if (ColumnType.NUMERIC == attr.cellType())
         else if (ColumnType.NUMERIC == attr.cellType())
         {
         {
-            cell.setCellType(CellType.NUMERIC);
             cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
             cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
         }
         }
     }
     }
@@ -980,10 +977,10 @@ public class ExcelUtil<T>
             Cell cell = row.getCell(column);
             Cell cell = row.getCell(column);
             if (StringUtils.isNotNull(cell))
             if (StringUtils.isNotNull(cell))
             {
             {
-                if (cell.getCellTypeEnum() == CellType.NUMERIC || cell.getCellTypeEnum() == CellType.FORMULA)
+                if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA)
                 {
                 {
                     val = cell.getNumericCellValue();
                     val = cell.getNumericCellValue();
-                    if (HSSFDateUtil.isCellDateFormatted(cell))
+                    if (DateUtil.isCellDateFormatted(cell))
                     {
                     {
                         val = DateUtil.getJavaDate((Double) val); // POI Excel 日期格式转换
                         val = DateUtil.getJavaDate((Double) val); // POI Excel 日期格式转换
                     }
                     }
@@ -999,15 +996,15 @@ public class ExcelUtil<T>
                         }
                         }
                     }
                     }
                 }
                 }
-                else if (cell.getCellTypeEnum() == CellType.STRING)
+                else if (cell.getCellType() == CellType.STRING)
                 {
                 {
                     val = cell.getStringCellValue();
                     val = cell.getStringCellValue();
                 }
                 }
-                else if (cell.getCellTypeEnum() == CellType.BOOLEAN)
+                else if (cell.getCellType() == CellType.BOOLEAN)
                 {
                 {
                     val = cell.getBooleanCellValue();
                     val = cell.getBooleanCellValue();
                 }
                 }
-                else if (cell.getCellTypeEnum() == CellType.ERROR)
+                else if (cell.getCellType() == CellType.ERROR)
                 {
                 {
                     val = cell.getErrorCellValue();
                     val = cell.getErrorCellValue();
                 }
                 }