From 4565785af82407f494caa5236696839c54aa786a Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Fri, 30 Aug 2024 09:46:58 +0800
Subject: [PATCH] 20240830

---
 .../GetInformationForExcelServiceImpl.java    | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java b/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
index bcc4d4a9..2a8d1881 100644
--- a/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
@@ -277,13 +277,28 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
         int index = 1;
         for (String s : fileName) {
             File excelFile = new File(s);
+            String fileType = s.substring(s.lastIndexOf(".")+1);
             List<Map<Integer, String>> list = new ArrayList<>();
             try {
-                list = EasyExcel.read(excelFile)
-                        .excelType(ExcelTypeEnum.XLSX)
-                        .headRowNumber(0)
-                        .sheet()
-                        .doReadSync();
+                if (ExcelTypeEnum.XLS.toString().equals(fileType.toUpperCase())){
+                    list = EasyExcel.read(excelFile)
+                            .excelType(ExcelTypeEnum.XLS)
+                            .headRowNumber(0)
+                            .sheet()
+                            .doReadSync();
+                }else if (ExcelTypeEnum.XLSX.toString().equals(fileType.toUpperCase())){
+                    list = EasyExcel.read(excelFile)
+                            .excelType(ExcelTypeEnum.XLSX)
+                            .headRowNumber(0)
+                            .sheet()
+                            .doReadSync();
+                }else if (ExcelTypeEnum.CSV.toString().equals(fileType.toUpperCase())){
+                    list = EasyExcel.read(excelFile)
+                            .excelType(ExcelTypeEnum.CSV)
+                            .headRowNumber(0)
+                            .sheet()
+                            .doReadSync();
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 log.info("读取文件失败,文件为:" + s + "失败日志:" + e.getMessage());