diff --git a/backend/pom.xml b/backend/pom.xml
index 392cd89d64..5415073b33 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -104,23 +104,15 @@
pagehelper
5.0.3
-
-
org.apache.shiro
shiro-spring-boot-starter
${shiro.version}
-
org.springframework.boot
spring-boot-starter-validation
-
org.apache.commons
commons-lang3
@@ -139,41 +131,26 @@
commons-codec
commons-codec
-
com.alibaba
fastjson
1.2.72
-
com.auth0
java-jwt
${jwt.version}
-
-
-
-
com.microsoft.sqlserver
mssql-jdbc
7.4.1.jre8
-
org.postgresql
postgresql
42.2.14
-
-
- com.oracle.database.jdbc
- ojdbc8
- 19.7.0.0
-
-
-
org.apache.curator
curator-framework
@@ -184,8 +161,6 @@
curator-recipes
4.0.1
-
-
com.alibaba
diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index 06c8405f54..619587a1be 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -905,7 +905,7 @@ public class ExtractDataService {
ExcelInputField[] fields = new ExcelInputField[datasetTableFields.size()];
for (int i = 0; i < datasetTableFields.size(); i++) {
ExcelInputField field = new ExcelInputField();
- field.setName(datasetTableFields.get(i).getOriginName());
+ field.setName(datasetTableFields.get(i).getDataeaseName());
if (datasetTableFields.get(i).getDeExtractType() == 1) {
field.setType("String");
field.setFormat("yyyy-MM-dd HH:mm:ss");
@@ -968,13 +968,14 @@ public class ExtractDataService {
TextFileField[] outputFields = new TextFileField[datasetTableFields.size() + 1];
for(int i=0;i< datasetTableFields.size();i++){
TextFileField textFileField = new TextFileField();
- textFileField.setName(datasetTableFields.get(i).getOriginName());
+ textFileField.setName(datasetTableFields.get(i).getDataeaseName());
if (datasetTableFields.get(i).getDeExtractType() == 2) {
textFileField.setType("Integer");
textFileField.setFormat("0");
} else {
textFileField.setType("String");
}
+
outputFields[i] = textFileField;
}
TextFileField textFileField = new TextFileField();
@@ -1013,7 +1014,7 @@ public class ExtractDataService {
tmp_code = tmp_code.replace("handleWraps", handleWraps);
String Column_Fields = "";
- if (datasourceType.equals(DatasourceTypes.excel) || datasourceType.equals(DatasourceTypes.oracle)) {
+ if (datasourceType.equals(DatasourceTypes.oracle)) {
Column_Fields = String.join(",", datasetTableFields.stream().map(DatasetTableField::getOriginName).collect(Collectors.toList()));
} else {
Column_Fields = String.join(",", datasetTableFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.toList()));