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

fix: 抽取数据

Browse Source
This commit is contained in:
taojinlong 2021-08-31 20:41:57 +08:00
parent 46cd685522
commit 60b1275395
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1001,8 +1001,9 @@ public class ExtractDataService {
} }
private StepMeta udjc(List<DatasetTableField> datasetTableFields, DatasourceTypes datasourceType) { private StepMeta udjc(List<DatasetTableField> datasetTableFields, DatasourceTypes datasourceType) {
String needToChangeColumnType = ""; // String needToChangeColumnType = "";
String handleBinaryTypeCode = ""; String handleBinaryTypeCode = "";
String excelCompletion = "";
for (DatasetTableField datasetTableField : datasetTableFields) { for (DatasetTableField datasetTableField : datasetTableFields) {
if(datasetTableField.getDeExtractType() == 5){ if(datasetTableField.getDeExtractType() == 5){
@ -1016,9 +1017,8 @@ public class ExtractDataService {
fields.add(fieldInfo); fields.add(fieldInfo);
userDefinedJavaClassMeta.setFieldInfo(fields); userDefinedJavaClassMeta.setFieldInfo(fields);
List<UserDefinedJavaClassDef> definitions = new ArrayList<UserDefinedJavaClassDef>(); List<UserDefinedJavaClassDef> definitions = new ArrayList<UserDefinedJavaClassDef>();
String tmp_code = code.replace("alterColumnTypeCode", needToChangeColumnType); String tmp_code = code.replace("handleWraps", handleWraps).replace("handleBinaryType", handleBinaryTypeCode);
tmp_code = tmp_code.replace("handleWraps", handleWraps);
String Column_Fields = ""; String Column_Fields = "";
if (datasourceType.equals(DatasourceTypes.oracle)) { if (datasourceType.equals(DatasourceTypes.oracle)) {
Column_Fields = String.join(",", datasetTableFields.stream().map(DatasetTableField::getOriginName).collect(Collectors.toList())); Column_Fields = String.join(",", datasetTableFields.stream().map(DatasetTableField::getOriginName).collect(Collectors.toList()));
@ -1027,12 +1027,13 @@ public class ExtractDataService {
} }
if (datasourceType.equals(DatasourceTypes.excel)) { if (datasourceType.equals(DatasourceTypes.excel)) {
tmp_code = tmp_code.replace("handleExcelIntColumn", handleExcelIntColumn).replace("Column_Fields", Column_Fields); tmp_code = tmp_code.replace("handleExcelIntColumn", handleExcelIntColumn).replace("Column_Fields", Column_Fields)
.replace("ExcelCompletion", excelCompletion);
} else { } else {
tmp_code = tmp_code.replace("handleExcelIntColumn", "").replace("Column_Fields", Column_Fields); tmp_code = tmp_code.replace("handleExcelIntColumn", "").replace("Column_Fields", Column_Fields)
.replace("ExcelCompletion", "");;
} }
tmp_code = tmp_code.replace("handleBinaryType", handleBinaryTypeCode);
UserDefinedJavaClassDef userDefinedJavaClassDef = new UserDefinedJavaClassDef(UserDefinedJavaClassDef.ClassType.TRANSFORM_CLASS, "Processor", tmp_code); UserDefinedJavaClassDef userDefinedJavaClassDef = new UserDefinedJavaClassDef(UserDefinedJavaClassDef.ClassType.TRANSFORM_CLASS, "Processor", tmp_code);
userDefinedJavaClassDef.setActive(true); userDefinedJavaClassDef.setActive(true);
@ -1121,15 +1122,15 @@ public class ExtractDataService {
" \t}"; " \t}";
private final static String alterColumnTypeCode = " if(\"FILED\".equalsIgnoreCase(filed)){\n" + // private final static String alterColumnTypeCode = " if(\"FILED\".equalsIgnoreCase(filed)){\n" +
"\t if(tmp != null && tmp.equalsIgnoreCase(\"Y\")){\n" + // "\t if(tmp != null && tmp.equalsIgnoreCase(\"Y\")){\n" +
" get(Fields.Out, filed).setValue(r, 1);\n" + // " get(Fields.Out, filed).setValue(r, 1);\n" +
" get(Fields.Out, filed).getValueMeta().setType(2);\n" + // " get(Fields.Out, filed).getValueMeta().setType(2);\n" +
" }else{\n" + // " }else{\n" +
" get(Fields.Out, filed).setValue(r, 0);\n" + // " get(Fields.Out, filed).setValue(r, 0);\n" +
" get(Fields.Out, filed).getValueMeta().setType(2);\n" + // " get(Fields.Out, filed).getValueMeta().setType(2);\n" +
" }\n" + // " }\n" +
" }\n" ; // " }\n" ;
private final static String handleExcelIntColumn = " \t\tif(tmp != null && tmp.endsWith(\".0\")){\n" + private final static String handleExcelIntColumn = " \t\tif(tmp != null && tmp.endsWith(\".0\")){\n" +
" try {\n" + " try {\n" +
@ -1144,8 +1145,9 @@ public class ExtractDataService {
" tmp = tmp.replaceAll(\"\\r\",\" \");\n" + " tmp = tmp.replaceAll(\"\\r\",\" \");\n" +
" tmp = tmp.replaceAll(\"\\n\",\" \");\n" + " tmp = tmp.replaceAll(\"\\n\",\" \");\n" +
" get(Fields.Out, filed).setValue(r, tmp);\n" + " get(Fields.Out, filed).setValue(r, tmp);\n" +
" } \n" + " } \n";
"\t\tif(tmp == null){\n" +
private final static String excelCompletion = "\t\tif(tmp == null){\n" +
" \t\t\ttmp = \"\";\n" + " \t\t\ttmp = \"\";\n" +
"\t\t\tget(Fields.Out, filed).setValue(r, tmp);\n" + "\t\t\tget(Fields.Out, filed).setValue(r, tmp);\n" +
"\t\t}"; "\t\t}";
@ -1180,7 +1182,7 @@ public class ExtractDataService {
" for (String filed : fileds) {\n" + " for (String filed : fileds) {\n" +
" String tmp = get(Fields.In, filed).getString(r);\n" + " String tmp = get(Fields.In, filed).getString(r);\n" +
"handleWraps \n" + "handleWraps \n" +
"alterColumnTypeCode \n" + "ExcelCompletion \n" +
"handleBinaryType \n" + "handleBinaryType \n" +
"handleExcelIntColumn \n" + "handleExcelIntColumn \n" +
" str = str + tmp;\n" + " str = str + tmp;\n" +