github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 03:52:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #5835 from dataease/pr@dev@fixdatasource

Browse Source 
fix: 解析 excel 数据异常
This commit is contained in:
taojinlong 2023-08-03 12:14:04 +08:00 committed by GitHub
commit af959897fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -6,6 +6,8 @@ import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener; import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.excel.metadata.CellData; import com.alibaba.excel.metadata.CellData;
import com.alibaba.excel.read.metadata.ReadSheet; import com.alibaba.excel.read.metadata.ReadSheet;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
@ -2441,7 +2443,9 @@ public class DataSetTableService {
tableFiled.setRemarks(s); tableFiled.setRemarks(s);
fields.add(tableFiled); fields.add(tableFiled);
} }
List<List<String>> data = (isPreview && noModelDataListener.getData().size() > 1000 ? new ArrayList<>(noModelDataListener.getData().subList(0, 1000)) : noModelDataListener.getData()); String json = JSON.toJSONString(noModelDataListener.getData());
List<List<String>> data = JSON.parseObject(json, new TypeReference< List<List<String>>>(){});
data = (isPreview && noModelDataListener.getData().size() > 1000 ? new ArrayList<>(data.subList(0, 1000)) : data);
if (isPreview) { if (isPreview) {
for (List<String> datum : data) { for (List<String> datum : data) {
for (int i = 0; i < datum.size(); i++) { for (int i = 0; i < datum.size(); i++) {
@ -2518,6 +2522,7 @@ public class DataSetTableService {
} }
inputStream.close(); inputStream.close();
excelSheetDataList.forEach(excelSheetData -> { excelSheetDataList.forEach(excelSheetData -> {
List<List<String>> data = excelSheetData.getData(); List<List<String>> data = excelSheetData.getData();
String[] fieldArray = excelSheetData.getFields().stream().map(TableField::getFieldName).toArray(String[]::new); String[] fieldArray = excelSheetData.getFields().stream().map(TableField::getFieldName).toArray(String[]::new);