提交 5f60eb3f authored 作者: taojinlong's avatar taojinlong

feat: 抽取数据适配[新增字段]

上级 b84225be
...@@ -1183,7 +1183,7 @@ public class DataSetTableService { ...@@ -1183,7 +1183,7 @@ public class DataSetTableService {
if (StringUtils.isNotEmpty(tableId) && editType == 1 ) { if (StringUtils.isNotEmpty(tableId) && editType == 1 ) {
List<DatasetTableField> datasetTableFields = dataSetTableFieldsService.getFieldsByTableId(tableId); List<DatasetTableField> datasetTableFields = dataSetTableFieldsService.getFieldsByTableId(tableId);
datasetTableFields.stream().filter(datasetTableField -> datasetTableField.getDataeaseName().startsWith("C_")).collect(Collectors.toList()); datasetTableFields.stream().filter(datasetTableField -> datasetTableField.getExtField() == 0).collect(Collectors.toList());
datasetTableFields.sort((o1, o2) -> { datasetTableFields.sort((o1, o2) -> {
if (o1.getColumnIndex() == null) { if (o1.getColumnIndex() == null) {
return -1; return -1;
......
...@@ -164,7 +164,7 @@ public class ExtractDataService { ...@@ -164,7 +164,7 @@ public class ExtractDataService {
if(datasetTableFields == null){ if(datasetTableFields == null){
datasetTableFields = dataSetTableFieldsService.list(DatasetTableField.builder().tableId(datasetTable.getId()).build()); datasetTableFields = dataSetTableFieldsService.list(DatasetTableField.builder().tableId(datasetTable.getId()).build());
} }
datasetTableFields = datasetTableFields.stream().filter(datasetTableField -> datasetTableField.getDataeaseName().startsWith("C_")).collect(Collectors.toList()); datasetTableFields = datasetTableFields.stream().filter(datasetTableField -> datasetTableField.getExtField() == 0).collect(Collectors.toList());
datasetTableFields.sort((o1, o2) -> { datasetTableFields.sort((o1, o2) -> {
if (o1.getColumnIndex() == null) { if (o1.getColumnIndex() == null) {
return -1; return -1;
...@@ -274,7 +274,7 @@ public class ExtractDataService { ...@@ -274,7 +274,7 @@ public class ExtractDataService {
datasource.setType(datasetTable.getType()); datasource.setType(datasetTable.getType());
} }
List<DatasetTableField> datasetTableFields = dataSetTableFieldsService.list(DatasetTableField.builder().tableId(datasetTable.getId()).build()); List<DatasetTableField> datasetTableFields = dataSetTableFieldsService.list(DatasetTableField.builder().tableId(datasetTable.getId()).build());
datasetTableFields = datasetTableFields.stream().filter(datasetTableField -> datasetTableField.getDataeaseName().startsWith("C_")).collect(Collectors.toList()); datasetTableFields = datasetTableFields.stream().filter(datasetTableField -> datasetTableField.getExtField() == 0).collect(Collectors.toList());
datasetTableFields.sort((o1, o2) -> { datasetTableFields.sort((o1, o2) -> {
if (o1.getColumnIndex() == null) { if (o1.getColumnIndex() == null) {
return -1; return -1;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论