public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-23 13:58:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:dataease/dataease into main

Browse Source
This commit is contained in:
taojinlong
2021-05-12 15:18:06 +08:00
parent e89c8ac439 602e375071
commit 5c26b5986d
10 changed files with 65 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@@ -144,7 +144,6 @@ public class ChartViewService {
} else if (StringUtils.equalsIgnoreCase(table.getType(), "sql")) {
datasourceRequest.setQuery(getSQL(ds.getType(), " (" + dataTableInfoDTO.getSql() + ") AS tmp ", xAxis, yAxis, extFilterList));
}
LogUtil.info(datasourceRequest.getQuery());
data = datasourceProvider.getData(datasourceRequest);
} else if (table.getMode() == 1) {// 抽取
// 获取数据集de字段
@@ -159,7 +158,6 @@ public class ChartViewService {
String tableName = "ds_" + table.getId().replaceAll("-", "_");
datasourceRequest.setTable(tableName);
datasourceRequest.setQuery(getSQL(ds.getType(), tableName, xAxis, yAxis, extFilterList));
LogUtil.info(datasourceRequest.getQuery());
data = datasourceProvider.getData(datasourceRequest);
}

4
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@@ -242,7 +242,6 @@ public class DataSetTableService {
String table = dataTableInfoDTO.getTable();
datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray) + " LIMIT " + (page - 1) * pageSize + "," + realSize);
LogUtil.info(datasourceRequest.getQuery());
try {
data.addAll(datasourceProvider.getData(datasourceRequest));
} catch (Exception e) {
@@ -262,7 +261,6 @@ public class DataSetTableService {
String sql = dataTableInfoDTO.getSql();
datasourceRequest.setQuery(createQuerySQL(ds.getType(), " (" + sql + ") AS tmp ", fieldArray) + " LIMIT " + (page - 1) * pageSize + "," + realSize);
LogUtil.info(datasourceRequest.getQuery());
try {
data.addAll(datasourceProvider.getData(datasourceRequest));
} catch (Exception e) {
@@ -281,7 +279,6 @@ public class DataSetTableService {
datasourceRequest.setDatasource(ds);
String table = DorisTableUtils.dorisName(dataSetTableRequest.getId());
datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray) + " LIMIT " + (page - 1) * pageSize + "," + realSize);
LogUtil.info(datasourceRequest.getQuery());
try {
data.addAll(jdbcProvider.getData(datasourceRequest));
} catch (Exception e) {
@@ -301,7 +298,6 @@ public class DataSetTableService {
datasourceRequest.setDatasource(ds);
String table = DorisTableUtils.dorisName(dataSetTableRequest.getId());
datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray) + " LIMIT " + (page - 1) * pageSize + "," + realSize);
LogUtil.info(datasourceRequest.getQuery());
try {
data.addAll(jdbcProvider.getData(datasourceRequest));
} catch (Exception e) {