github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 03:52:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #4534 from ZhaoQian1222/pr@dev@feature_extend_params

Browse Source 
feat: 数据源插件添加获取数据请求体参数
This commit is contained in:
taojinlong 2023-02-15 15:58:46 +08:00 committed by GitHub
commit f337553e65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -529,6 +529,9 @@ public class ChartViewService {
xAxisForRequest.addAll(xAxis); xAxisForRequest.addAll(xAxis);
xAxisForRequest.addAll(extStack); xAxisForRequest.addAll(extStack);
datasourceRequest.setXAxis(xAxisForRequest); datasourceRequest.setXAxis(xAxisForRequest);
List<ChartViewFieldDTO> yAxisForRequest = new ArrayList<>();
yAxisForRequest.addAll(yAxis);
datasourceRequest.setYAxis(yAxisForRequest);
data = datasourceProvider.getData(datasourceRequest); data = datasourceProvider.getData(datasourceRequest);
} else if (table.getMode() == 1) {// 抽取 } else if (table.getMode() == 1) {// 抽取
datasourceRequest.setDatasource(ds); datasourceRequest.setDatasource(ds);
@ -1037,6 +1040,7 @@ public class ChartViewService {
} }
if (StringUtils.isNotEmpty(totalPageSql) && StringUtils.equalsIgnoreCase((String) mapSize.get("tablePageMode"), "page")) { if (StringUtils.isNotEmpty(totalPageSql) && StringUtils.equalsIgnoreCase((String) mapSize.get("tablePageMode"), "page")) {
datasourceRequest.setQuery(totalPageSql); datasourceRequest.setQuery(totalPageSql);
datasourceRequest.setTotalPageFlag(true);
java.util.List<java.lang.String[]> tmpData = datasourceProvider.getData(datasourceRequest); java.util.List<java.lang.String[]> tmpData = datasourceProvider.getData(datasourceRequest);
totalItems = CollectionUtils.isEmpty(tmpData) ? 0 : Long.valueOf(tmpData.get(0)[0]); totalItems = CollectionUtils.isEmpty(tmpData) ? 0 : Long.valueOf(tmpData.get(0)[0]);
totalPage = (totalItems / pageInfo.getPageSize()) + (totalItems % pageInfo.getPageSize() > 0 ? 1 : 0); totalPage = (totalItems / pageInfo.getPageSize()) + (totalItems % pageInfo.getPageSize() > 0 ? 1 : 0);
@ -1047,6 +1051,10 @@ public class ChartViewService {
xAxisForRequest.addAll(xAxis); xAxisForRequest.addAll(xAxis);
xAxisForRequest.addAll(extStack); xAxisForRequest.addAll(extStack);
datasourceRequest.setXAxis(xAxisForRequest); datasourceRequest.setXAxis(xAxisForRequest);
List<ChartViewFieldDTO> yAxisForRequest = new ArrayList<>();
yAxisForRequest.addAll(yAxis);
datasourceRequest.setYAxis(yAxisForRequest);
datasourceRequest.setTotalPageFlag(false);
data = datasourceProvider.getData(datasourceRequest); data = datasourceProvider.getData(datasourceRequest);
if (CollectionUtils.isNotEmpty(assistFields)) { if (CollectionUtils.isNotEmpty(assistFields)) {
datasourceAssistRequest.setQuery(assistSQL(datasourceRequest.getQuery(), assistFields)); datasourceAssistRequest.setQuery(assistSQL(datasourceRequest.getQuery(), assistFields));

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

@ -34,6 +34,7 @@ import io.dataease.plugins.common.base.mapper.*;
import io.dataease.plugins.common.constants.DatasetType; import io.dataease.plugins.common.constants.DatasetType;
import io.dataease.plugins.common.constants.DatasourceTypes; import io.dataease.plugins.common.constants.DatasourceTypes;
import io.dataease.plugins.common.constants.DeTypeConstants; import io.dataease.plugins.common.constants.DeTypeConstants;
import io.dataease.plugins.common.dto.chart.ChartViewFieldDTO;
import io.dataease.plugins.common.dto.dataset.SqlVariableDetails; import io.dataease.plugins.common.dto.dataset.SqlVariableDetails;
import io.dataease.plugins.common.dto.datasource.DataSourceType; import io.dataease.plugins.common.dto.datasource.DataSourceType;
import io.dataease.plugins.common.dto.datasource.TableField; import io.dataease.plugins.common.dto.datasource.TableField;
@ -712,6 +713,7 @@ public class DataSetTableService {
datasourceRequest.setPreviewData(true); datasourceRequest.setPreviewData(true);
try { try {
datasourceRequest.setPageable(true); datasourceRequest.setPageable(true);
datasourceRequest.setPermissionFields(fields);
data.addAll(datasourceProvider.getData(datasourceRequest)); data.addAll(datasourceProvider.getData(datasourceRequest));
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage()); logger.error(e.getMessage());

1
backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java
View File

@ -195,6 +195,7 @@ public class DirectFieldService implements DataSetFieldService {
datasourceRequest.setQuery(qp.createQuerySQL(tableName, permissionFields, !needSort, null, customFilter, rowPermissionsTree, deSortFields)); datasourceRequest.setQuery(qp.createQuerySQL(tableName, permissionFields, !needSort, null, customFilter, rowPermissionsTree, deSortFields));
} }
LogUtil.info(datasourceRequest.getQuery()); LogUtil.info(datasourceRequest.getQuery());
datasourceRequest.setPermissionFields(permissionFields);
List<String[]> rows = datasourceProvider.getData(datasourceRequest); List<String[]> rows = datasourceProvider.getData(datasourceRequest);
if (!needMapping) { if (!needMapping) {
List<Object> results = rows.stream().map(row -> row[0]).distinct().collect(Collectors.toList()); List<Object> results = rows.stream().map(row -> row[0]).distinct().collect(Collectors.toList());