From ccfbc61a07d79706661482da610ebaed27c6b4e8 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 7 Mar 2024 17:15:41 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0csv=E6=96=87=E4=BB=B6=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/dataset/DataSetTableService.java | 4 ++-- .../java/io/dataease/service/dataset/ExtractDataService.java | 4 ++-- 2 files changed, 4 insertions(+), 4 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 7f9ffb7585..55ef207d28 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 @@ -2375,8 +2375,6 @@ public class DataSetTableService { public List parseExcel(String filename, InputStream inputStream, boolean isPreview) throws Exception { List excelSheetDataList = new ArrayList<>(); String suffix = filename.substring(filename.lastIndexOf(".") + 1); - excelSheetDataList = excelSheetDataList(inputStream, isPreview); - if (StringUtils.equalsIgnoreCase(suffix, "csv")) { List fields = new ArrayList<>(); BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)); @@ -2418,6 +2416,8 @@ public class DataSetTableService { excelSheetData.setExcelLabel(filename); excelSheetData.setFieldsMd5(Md5Utils.md5(StringUtils.join(fieldArray, ","))); excelSheetDataList.add(excelSheetData); + }else { + excelSheetDataList = excelSheetDataList(inputStream, isPreview); } inputStream.close(); 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 fea4504926..ef5ef50634 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,8 +757,6 @@ public class ExtractDataService { for (ExcelSheetData excelSheetData : excelSheetDataList) { String suffix = excelSheetData.getPath().substring(excelSheetData.getPath().lastIndexOf(".") + 1); List totalSheets = new ArrayList<>(); - totalSheets = dataSetTableService.excelSheetDataList(new FileInputStream(excelSheetData.getPath()), false); - if (StringUtils.equalsIgnoreCase(suffix, "csv")) { List fields = new ArrayList<>(); BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(excelSheetData.getPath()), StandardCharsets.UTF_8)); @@ -796,6 +794,8 @@ public class ExtractDataService { csvSheetData.setExcelLabel(excelSheetData.getExcelLabel()); csvSheetData.setFieldsMd5(Md5Utils.md5(StringUtils.join(fieldArray, ","))); totalSheets = Arrays.asList(csvSheetData); + }else { + totalSheets = dataSetTableService.excelSheetDataList(new FileInputStream(excelSheetData.getPath()), false); }