Skip to content

D
dataease
提交 a628698a authored 作者: junjie's avatar junjie
浏览文件
操作

refactor: 数据集报错优化

上级 e3fdf9a4
显示空白字符变更
内嵌 并排
正在显示 包含 22 行增加 和 22 行删除
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
浏览文件 @ a628698a
...@@ -155,7 +155,7 @@ public class DataSetTableService { ...@@ -155,7 +155,7 @@ public class DataSetTableService {
saveExcelTableField(sheetTable.getId(), excelSheetDataList.get(0).getFields(), true); saveExcelTableField(sheetTable.getId(), excelSheetDataList.get(0).getFields(), true);
datasetIdList.add(sheetTable.getId()); datasetIdList.add(sheetTable.getId());
} }
datasetIdList.forEach(datasetId ->{ datasetIdList.forEach(datasetId -> {
commonThreadPool.addTask(() -> extractDataService.extractExcelData(datasetId, "all_scope", "初始导入", null, datasetIdList)); commonThreadPool.addTask(() -> extractDataService.extractExcelData(datasetId, "all_scope", "初始导入", null, datasetIdList));
}); });
} else { } else {
...@@ -182,7 +182,7 @@ public class DataSetTableService { ...@@ -182,7 +182,7 @@ public class DataSetTableService {
saveExcelTableField(sheetTable.getId(), sheet.getFields(), true); saveExcelTableField(sheetTable.getId(), sheet.getFields(), true);
datasetIdList.add(sheetTable.getId()); datasetIdList.add(sheetTable.getId());
} }
datasetIdList.forEach(datasetId ->{ datasetIdList.forEach(datasetId -> {
commonThreadPool.addTask(() -> extractDataService.extractExcelData(datasetId, "all_scope", "初始导入", null, datasetIdList)); commonThreadPool.addTask(() -> extractDataService.extractExcelData(datasetId, "all_scope", "初始导入", null, datasetIdList));
}); });
...@@ -510,7 +510,7 @@ public class DataSetTableService { ...@@ -510,7 +510,7 @@ public class DataSetTableService {
data.addAll(datasourceProvider.getData(datasourceRequest)); data.addAll(datasourceProvider.getData(datasourceRequest));
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
DEException.throwException(Translator.get("i18n_ds_error")); DEException.throwException(Translator.get("i18n_ds_error") + "->" + e.getMessage());
} }
try { try {
...@@ -519,7 +519,7 @@ public class DataSetTableService { ...@@ -519,7 +519,7 @@ public class DataSetTableService {
dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size()); dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size());
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
DEException.throwException(Translator.get("i18n_ds_error")); DEException.throwException(Translator.get("i18n_ds_error") + "->" + e.getMessage());
} }
} else { } else {
// check doris table // check doris table
...@@ -538,14 +538,14 @@ public class DataSetTableService { ...@@ -538,14 +538,14 @@ public class DataSetTableService {
data.addAll(jdbcProvider.getData(datasourceRequest)); data.addAll(jdbcProvider.getData(datasourceRequest));
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
DEException.throwException(Translator.get("i18n_ds_error")); DEException.throwException(Translator.get("i18n_ds_error") + "->" + e.getMessage());
} }
try { try {
datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds, customFilter)); datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds, customFilter));
dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size()); dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size());
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
DEException.throwException(Translator.get("i18n_ds_error")); DEException.throwException(Translator.get("i18n_ds_error") + "->" + e.getMessage());
} }
} }
...@@ -576,7 +576,7 @@ public class DataSetTableService { ...@@ -576,7 +576,7 @@ public class DataSetTableService {
data.addAll(datasourceProvider.getData(datasourceRequest)); data.addAll(datasourceProvider.getData(datasourceRequest));
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
DEException.throwException(Translator.get("i18n_ds_error")); DEException.throwException(Translator.get("i18n_ds_error") + "->" + e.getMessage());
} }
try { try {
datasourceRequest.setPageable(false); datasourceRequest.setPageable(false);
...@@ -584,7 +584,7 @@ public class DataSetTableService { ...@@ -584,7 +584,7 @@ public class DataSetTableService {
dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size()); dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size());
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
DEException.throwException(Translator.get("i18n_ds_error")); DEException.throwException(Translator.get("i18n_ds_error") + "->" + e.getMessage());
} }
} else { } else {
// check doris table // check doris table
...@@ -603,14 +603,14 @@ public class DataSetTableService { ...@@ -603,14 +603,14 @@ public class DataSetTableService {
data.addAll(jdbcProvider.getData(datasourceRequest)); data.addAll(jdbcProvider.getData(datasourceRequest));
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
DEException.throwException(Translator.get("i18n_ds_error")); DEException.throwException(Translator.get("i18n_ds_error") + "->" + e.getMessage());
} }
try { try {
datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds, customFilter)); datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds, customFilter));
dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size()); dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size());
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
DEException.throwException(Translator.get("i18n_ds_error")); DEException.throwException(Translator.get("i18n_ds_error") + "->" + e.getMessage());
} }
} }
} else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "excel")) { } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "excel")) {
...@@ -630,14 +630,14 @@ public class DataSetTableService { ...@@ -630,14 +630,14 @@ public class DataSetTableService {
data.addAll(jdbcProvider.getData(datasourceRequest)); data.addAll(jdbcProvider.getData(datasourceRequest));
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
DEException.throwException(Translator.get("i18n_ds_error")); DEException.throwException(Translator.get("i18n_ds_error") + "->" + e.getMessage());
} }
try { try {
datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds, customFilter)); datasourceRequest.setQuery(qp.createQueryTableWithLimit(table, fields, Integer.valueOf(dataSetTableRequest.getRow()), false, ds, customFilter));
dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size()); dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size());
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
DEException.throwException(Translator.get("i18n_ds_error")); DEException.throwException(Translator.get("i18n_ds_error") + "->" + e.getMessage());
} }
} else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "custom")) { } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "custom")) {
if (datasetTable.getMode() == 0) { if (datasetTable.getMode() == 0) {
...@@ -657,7 +657,7 @@ public class DataSetTableService { ...@@ -657,7 +657,7 @@ public class DataSetTableService {
sql = getCustomSQLDatasource(dt, list, ds); sql = getCustomSQLDatasource(dt, list, ds);
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
DEException.throwException(Translator.get("i18n_ds_error")); DEException.throwException(Translator.get("i18n_ds_error") + "->" + e.getMessage());
} }
QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
datasourceRequest.setQuery(qp.createQuerySQLWithPage(sql, fields, page, pageSize, realSize, false, customFilter)); datasourceRequest.setQuery(qp.createQuerySQLWithPage(sql, fields, page, pageSize, realSize, false, customFilter));
...@@ -672,7 +672,7 @@ public class DataSetTableService { ...@@ -672,7 +672,7 @@ public class DataSetTableService {
data.addAll(datasourceProvider.getData(datasourceRequest)); data.addAll(datasourceProvider.getData(datasourceRequest));
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
DEException.throwException(Translator.get("i18n_ds_error")); DEException.throwException(Translator.get("i18n_ds_error") + "->" + e.getMessage());
} }
try { try {
datasourceRequest.setPageable(false); datasourceRequest.setPageable(false);
...@@ -680,7 +680,7 @@ public class DataSetTableService { ...@@ -680,7 +680,7 @@ public class DataSetTableService {
dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size()); dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size());
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
DEException.throwException(Translator.get("i18n_ds_error")); DEException.throwException(Translator.get("i18n_ds_error") + "->" + e.getMessage());
} }
} else { } else {
Datasource ds = (Datasource) CommonBeanFactory.getBean("DorisDatasource"); Datasource ds = (Datasource) CommonBeanFactory.getBean("DorisDatasource");
...@@ -695,7 +695,7 @@ public class DataSetTableService { ...@@ -695,7 +695,7 @@ public class DataSetTableService {
data.addAll(jdbcProvider.getData(datasourceRequest)); data.addAll(jdbcProvider.getData(datasourceRequest));
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
DEException.throwException(Translator.get("i18n_ds_error")); DEException.throwException(Translator.get("i18n_ds_error") + "->" + e.getMessage());
} }
try { try {
...@@ -703,7 +703,7 @@ public class DataSetTableService { ...@@ -703,7 +703,7 @@ public class DataSetTableService {
dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size()); dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size());
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
DEException.throwException(Translator.get("i18n_ds_error")); DEException.throwException(Translator.get("i18n_ds_error") + "->" + e.getMessage());
} }
} }
} else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "union")) { } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "union")) {
...@@ -723,7 +723,7 @@ public class DataSetTableService { ...@@ -723,7 +723,7 @@ public class DataSetTableService {
sql = (String) getUnionSQLDatasource(dt, ds).get("sql"); sql = (String) getUnionSQLDatasource(dt, ds).get("sql");
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
DEException.throwException(Translator.get("i18n_ds_error")); DEException.throwException(Translator.get("i18n_ds_error") + "->" + e.getMessage());
} }
QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
datasourceRequest.setQuery(qp.createQuerySQLWithPage(sql, fields, page, pageSize, realSize, false, customFilter)); datasourceRequest.setQuery(qp.createQuerySQLWithPage(sql, fields, page, pageSize, realSize, false, customFilter));
...@@ -738,7 +738,7 @@ public class DataSetTableService { ...@@ -738,7 +738,7 @@ public class DataSetTableService {
data.addAll(datasourceProvider.getData(datasourceRequest)); data.addAll(datasourceProvider.getData(datasourceRequest));
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
DEException.throwException(Translator.get("i18n_ds_error")); DEException.throwException(Translator.get("i18n_ds_error") + "->" + e.getMessage());
} }
try { try {
datasourceRequest.setPageable(false); datasourceRequest.setPageable(false);
...@@ -746,7 +746,7 @@ public class DataSetTableService { ...@@ -746,7 +746,7 @@ public class DataSetTableService {
dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size()); dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size());
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
DEException.throwException(Translator.get("i18n_ds_error")); DEException.throwException(Translator.get("i18n_ds_error") + "->" + e.getMessage());
} }
} else { } else {
Datasource ds = (Datasource) CommonBeanFactory.getBean("DorisDatasource"); Datasource ds = (Datasource) CommonBeanFactory.getBean("DorisDatasource");
...@@ -761,7 +761,7 @@ public class DataSetTableService { ...@@ -761,7 +761,7 @@ public class DataSetTableService {
data.addAll(jdbcProvider.getData(datasourceRequest)); data.addAll(jdbcProvider.getData(datasourceRequest));
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
DEException.throwException(Translator.get("i18n_ds_error")); DEException.throwException(Translator.get("i18n_ds_error") + "->" + e.getMessage());
} }
try { try {
...@@ -769,7 +769,7 @@ public class DataSetTableService { ...@@ -769,7 +769,7 @@ public class DataSetTableService {
dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size()); dataSetPreviewPage.setTotal(jdbcProvider.getData(datasourceRequest).size());
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());
DEException.throwException(Translator.get("i18n_ds_error")); DEException.throwException(Translator.get("i18n_ds_error") + "->" + e.getMessage());
} }
} }
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论