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-01-29 17:36:19 +08:00
parent 82a5965832
commit 3f6ac97d9d
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
View File

@ -70,6 +70,8 @@ public class MysqlQueryProvider extends QueryProvider {
case "TIME":
case "YEAR":
case "DATETIME":
case "DATEV2":
case "DATETIMEV2":
case "TIMESTAMP":
return 1;// 时间
case "INT":

12
core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
View File

@ -1158,14 +1158,13 @@ public class ExtractDataService {
for (ExcelSheetData excelSheetData : excelSheetDataList) {
StepMeta fromStep = null;
String suffix = excelSheetData.getPath().substring(excelSheetDataList.get(0).getPath().lastIndexOf(".") + 1);
Integer fileInputFields = isSetKey ? datasetTableFields.size() : datasetTableFields.size() - 1;
if (StringUtils.equalsIgnoreCase(suffix, "csv")) {
CsvInputMeta csvInputMeta = new CsvInputMeta();
csvInputMeta.setFilename(excelSheetData.getPath());
csvInputMeta.setHeaderPresent(true);
csvInputMeta.setBufferSize("10000");
csvInputMeta.setDelimiter(",");
Integer fileInputFields = isSetKey ? datasetTableFields.size() : datasetTableFields.size() - 1;
TextFileInputField[] fields = new TextFileInputField[fileInputFields];
for (int i = 0; i < datasetTableFields.size(); i++) {
@ -1209,8 +1208,11 @@ public class ExtractDataService {
excelInputMeta.setFileRequired(filesRequired.toArray(new String[filesRequired.size()]));
excelInputMeta.setStartsWithHeader(true);
excelInputMeta.setIgnoreEmptyRows(true);
ExcelInputField[] fields = new ExcelInputField[datasetTableFields.size()];
ExcelInputField[] fields = new ExcelInputField[fileInputFields];
for (int i = 0; i < datasetTableFields.size(); i++) {
if(datasetTableFields.get(i).getDataeaseName().equalsIgnoreCase("dataease_uuid")){
continue;
}
ExcelInputField field = new ExcelInputField();
field.setName(datasetTableFields.get(i).getDataeaseName());
if (datasetTableFields.get(i).getDeExtractType() == 1) {
@ -1295,11 +1297,13 @@ public class ExtractDataService {
String excelCompletion = "";
for (DatasetTableField datasetTableField : datasetTableFields) {
if(isSetKey && datasetTableField.getDataeaseName().equals("dataease_uuid")){
continue;
}
if (datasetTableField.getDeExtractType().equals(DeTypeConstants.DE_BINARY) || datasetTableField.getType().equalsIgnoreCase("blob")) {
handleBinaryTypeCode.append("\n").append(handleBinaryType.replace("FIELD", datasetTableField.getDataeaseName()));
}
}
UserDefinedJavaClassMeta userDefinedJavaClassMeta = new UserDefinedJavaClassMeta();
List<UserDefinedJavaClassMeta.FieldInfo> fields = new ArrayList<>();
if (!isSetKey) {

1
core/frontend/src/views/dataset/add/AddApi.vue
View File

@ -163,6 +163,7 @@
<el-select
size="small"
style="margin-left: 12px;width: 315px"
v-model="activeTable.keys"
v-if="engineMode !== 'simple'"
multiple

1
core/frontend/src/views/dataset/add/AddExcel.vue
View File

@ -141,6 +141,7 @@
<el-checkbox v-model="sheetObj.setKey">{{ $t('dataset.set_key') }}</el-checkbox>
<el-select
size="small"
style="margin-left: 12px;width: 315px"
v-model="sheetObj.keys"
v-if="mode === '1'"
multiple

1
core/frontend/src/views/dataset/add/AddSQL.vue
View File

@ -65,6 +65,7 @@
<el-select
size="small"
style="margin-left: 12px;width: 315px"
v-model="param.keys"
v-if="mode === '1' && engineMode !== 'simple'"
multiple