center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 上传excel出错

Browse Source
This commit is contained in:
taojinlong 2024-08-29 19:07:41 +08:00
parent 69dd20b7de
commit 396ed75b40
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
View File

@ -65,6 +65,10 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.*;
import java.util.stream.Collectors;
@ -850,6 +854,25 @@ public class DatasourceServer implements DatasourceApi {
datasourceSyncManage.extractedData(null, coreDatasource, updateType, MANUAL.toString());
}
public static <T> List<T> deepCopy(List<T> originalList) {
try {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ObjectOutputStream oos = new ObjectOutputStream(bos);
oos.writeObject(originalList);
oos.close();
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bis);
List<T> newList = (List<T>) ois.readObject();
ois.close();
return newList;
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
public ExcelFileData excelUpload(@RequestParam("file") MultipartFile file, @RequestParam("id") long datasourceId, @RequestParam("editType") Integer editType) throws DEException {
ExcelUtils excelUtils = new ExcelUtils();
ExcelFileData excelFileData = excelUtils.excelSaveAndParse(file);
@ -863,11 +886,10 @@ public class DatasourceServer implements DatasourceApi {
for (ExcelSheetData sheet : excelFileData.getSheets()) {
for (DatasetTableDTO datasetTableDTO : datasetTableDTOS) {
if (excelDataTableName(datasetTableDTO.getTableName()).equals(sheet.getTableName()) || isCsv(file.getOriginalFilename())) {
List<TableField> newTableFields = sheet.getFields();
List<TableField> newTableFields = deepCopy(sheet.getFields());
newTableFields.sort((o1, o2) -> {
return o1.getName().compareTo(o2.getName());
});
datasourceRequest.setTable(datasetTableDTO.getTableName());
List<TableField> oldTableFields = ExcelUtils.getTableFields(datasourceRequest);
oldTableFields.sort((o1, o2) -> {

3
sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/dto/TableField.java
View File

@ -2,11 +2,12 @@ package io.dataease.extensions.datasource.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
@Data
public class TableField {
public class TableField implements Serializable {
private String name;
private String originName;
private String type; //SQL type from java.sql.Types