From 2fd29a71e4612f3f9766995d02e223a545943a3b Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Fri, 27 Aug 2021 17:40:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E6=9E=90excel=E5=87=BA?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/commons/utils/ExcelReaderUtil.java   |  8 +++-----
 .../io/dataease/commons/utils/ExcelXlsxReader.java   | 12 ++++++++++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java b/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java
index d90f453cb2..53249d256b 100644
--- a/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java
+++ b/backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java
@@ -57,13 +57,11 @@ public class ExcelReaderUtil {
             ExcelXlsxReader excelXlsxReader = new ExcelXlsxReader();
             excelXlsxReader.process(inputStream);
             System.out.println(excelXlsxReader.totalSheets.size());
-            System.out.println(excelXlsxReader.totalSheets.get(1).getExcelLable());
-            for (TableFiled field : excelXlsxReader.totalSheets.get(1).getFields()) {
+            System.out.println(excelXlsxReader.totalSheets.get(0).getExcelLable());
+            for (TableFiled field : excelXlsxReader.totalSheets.get(0).getFields()) {
                 System.out.println(new Gson().toJson(field));
             }
             System.out.println(excelXlsxReader.totalSheets.get(0).getData().get(0));
-            System.out.println(excelXlsxReader.totalSheets.get(0).getData().get(1));
-            System.out.println(excelXlsxReader.totalSheets.get(0).getData().get(2));
 
         } else {
             throw new Exception("文件格式错误，fileName的扩展名只能是xls或xlsx。");
@@ -71,7 +69,7 @@ public class ExcelReaderUtil {
     }
 
     public static void main(String[] args) throws Exception {
-        String file ="赤收管理 2.xlsx";
+        String file ="Metersphere_case_DataEase功能用例.xlsx";
         ExcelReaderUtil.readExcel(file, new FileInputStream("/Users/taojinlong/Desktop/" + file));
     }
 }
diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
index 43396bcf8f..63f8950914 100644
--- a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
+++ b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
@@ -237,6 +237,14 @@ public class ExcelXlsxReader extends DefaultHandler {
         if (isTElement) {//这个程序没经过
             //将单元格内容加入rowlist中，在这之前先去掉字符串前后的空白符
             String value = lastIndex.trim();
+            if(curRow==1){
+                TableFiled tableFiled = new TableFiled();
+                tableFiled.setFieldType("TEXT");
+                tableFiled.setFieldSize(65533);
+                tableFiled.setFieldName(value);
+                tableFiled.setRemarks(value);
+                this.fields.add(tableFiled);
+            }
             cellList.add(curCol, value);
             curCol++;
             isTElement = false;
@@ -432,6 +440,10 @@ public class ExcelXlsxReader extends DefaultHandler {
                 }
             }
         }
+        if(curCol==1){
+            System.out.println(type);
+            System.out.println(nextDataType);
+        }
         return thisStr;
     }