批量导入兼容2007+版本Excel

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmStoreSyncController.java

@@ -25,7 +25,8 @@ import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.poi.ss.usermodel.*;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -994,13 +995,16 @@ public class WmStoreSyncController {
     public static List<Map<Integer, String>> readXlsOfBranch(InputStream in, int row) {
         List<Map<Integer, String>> result = new ArrayList<Map<Integer, String>>();
         try {
-            HSSFWorkbook hssfWorkbook = new HSSFWorkbook(in);
+            Workbook workbook = WorkbookFactory.create(in);
+//            HSSFWorkbook hssfWorkbook = new HSSFWorkbook(in);
             for (int numSheet = 0; numSheet < 1; numSheet++) {
-                HSSFSheet hssfSheet = hssfWorkbook.getSheetAt(numSheet);
+                Sheet sheet = workbook.getSheetAt(numSheet);
+//                HSSFSheet hssfSheet = hssfWorkbook.getSheetAt(numSheet);
 
                 //getPhysicalNumberOfRows：实际有数据的行数，去掉空行
-                for (int rowNum = row - 1, rowLength = hssfSheet.getPhysicalNumberOfRows(); rowNum <= rowLength; rowNum++) {
-                    HSSFRow hssfRow = hssfSheet.getRow(rowNum);
+                for (int rowNum = row - 1, rowLength = sheet.getPhysicalNumberOfRows(); rowNum <= rowLength; rowNum++) {
+                    Row hssfRow = sheet.getRow(rowNum);
+//                    HSSFRow hssfRow = hssfSheet.getRow(rowNum);
                     if (hssfRow == null) {
                         continue;
                     }
@@ -1010,7 +1014,8 @@ public class WmStoreSyncController {
 
                     Map<Integer, String> map = new HashMap<Integer, String>();
                     for (int colix = minColix; colix < maxColix; colix++) {
-                        HSSFCell hssfCell = hssfRow.getCell(colix);
+                        Cell hssfCell = hssfRow.getCell(colix);
+//                        HSSFCell hssfCell = hssfRow.getCell(colix);
                         if (hssfCell == null) {
                             map.put(colix, "");
                         } else {
@@ -1025,6 +1030,8 @@ public class WmStoreSyncController {
             }
         } catch (IOException e) {
             e.printStackTrace();
+        } catch (InvalidFormatException e) {
+            e.printStackTrace();
         }
         return result;
     }