From 3488ec0f26ea2593526f24bdb1294b026fc40de3 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 21 Feb 2024 18:20:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20DataEase=20?=
 =?UTF-8?q?v1.18.14=EF=BC=8Csimple=20=E6=A8=A1=E5=BC=8F=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=EF=BC=8CExcel=20=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=20#7534?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/DataSetTableService.java        | 13 +++----------
 .../service/dataset/ExtractDataService.java         |  9 +--------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index 98763a4824..09438ee0b5 100644
--- a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -8,6 +8,7 @@ import com.alibaba.excel.metadata.CellData;
 import com.alibaba.excel.read.metadata.ReadSheet;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
+import com.alibaba.fastjson.parser.Feature;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -2355,7 +2356,7 @@ public class DataSetTableService {
             }
             String json = JSON.toJSONString(noModelDataListener.getData());
             List<List<String>> data = JSON.parseObject(json, new TypeReference<List<List<String>>>() {
-            });
+            }, Feature.IgnoreNotMatch);
             data = (isPreview && noModelDataListener.getData().size() > 1000 ? new ArrayList<>(data.subList(0, 1000)) : data);
             if (isPreview) {
                 for (int i = 0; i < data.size(); i++) {
@@ -2379,15 +2380,7 @@ public class DataSetTableService {
     public List<ExcelSheetData> parseExcel(String filename, InputStream inputStream, boolean isPreview) throws Exception {
         List<ExcelSheetData> excelSheetDataList = new ArrayList<>();
         String suffix = filename.substring(filename.lastIndexOf(".") + 1);
-        if (StringUtils.equalsIgnoreCase(suffix, "xls")) {
-            ExcelXlsReader excelXlsReader = new ExcelXlsReader();
-            excelXlsReader.setObtainedNum(1000);
-            excelXlsReader.process(inputStream);
-            excelSheetDataList = excelXlsReader.totalSheets;
-        }
-        if (StringUtils.equalsIgnoreCase(suffix, "xlsx")) {
-            excelSheetDataList = excelSheetDataList(inputStream, isPreview);
-        }
+        excelSheetDataList = excelSheetDataList(inputStream, isPreview);
 
         if (StringUtils.equalsIgnoreCase(suffix, "csv")) {
             List<TableField> fields = new ArrayList<>();
diff --git a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index 9e69f6618c..fea4504926 100644
--- a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -757,14 +757,7 @@ public class ExtractDataService {
         for (ExcelSheetData excelSheetData : excelSheetDataList) {
             String suffix = excelSheetData.getPath().substring(excelSheetData.getPath().lastIndexOf(".") + 1);
             List<ExcelSheetData> totalSheets = new ArrayList<>();
-            if (StringUtils.equalsIgnoreCase(suffix, "xls")) {
-                ExcelXlsReader excelXlsReader = new ExcelXlsReader();
-                excelXlsReader.process(new FileInputStream(excelSheetData.getPath()));
-                totalSheets = excelXlsReader.totalSheets;
-            }
-            if (StringUtils.equalsIgnoreCase(suffix, "xlsx")) {
-                totalSheets = dataSetTableService.excelSheetDataList(new FileInputStream(excelSheetData.getPath()), false);
-            }
+            totalSheets = dataSetTableService.excelSheetDataList(new FileInputStream(excelSheetData.getPath()), false);
 
             if (StringUtils.equalsIgnoreCase(suffix, "csv")) {
                 List<TableField> fields = new ArrayList<>();