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

chore: log

Browse Source
This commit is contained in:
junjun 2023-12-28 10:38:57 +08:00
parent 497e85833d
commit b666e1a093
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1080,6 +1080,7 @@ public class ChartViewService {
fieldMap.put("xAxis", xAxis);
fieldMap.put("yAxis", yAxis);
PluginViewParam pluginViewParam = buildPluginParam(fieldMap, fieldCustomFilter, extFilterList, ds, table, view, rowPermissionsTree, chartExtRequest);
logger.info("PluginViewParam", gson.toJson(pluginViewParam));
String sql = pluginViewSql(pluginViewParam, view);
if (StringUtils.isBlank(sql)) {
return emptyChartViewDTO(view);
@ -1611,6 +1612,7 @@ public class ChartViewService {
PluginFilterTreeObj fieldFilters = gson.fromJson(gson.toJson(customFilters), PluginFilterTreeObj.class);
logger.info("PluginFilterTreeObj", gson.toJson(fieldFilters));
List<PluginChartExtFilter> panelFilters = extFilters.stream().map(filter -> gson.fromJson(gson.toJson(filter), PluginChartExtFilter.class)).collect(Collectors.toList());
List<PluginViewField> pluginViewFields = fieldMap.entrySet().stream().flatMap(entry -> entry.getValue().stream().map(field -> {

6
core/backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java
View File

@ -30,6 +30,8 @@ import io.dataease.service.dataset.DataSetTableService;
import io.dataease.service.dataset.DataSetTableUnionService;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -56,6 +58,8 @@ public class ViewPluginBaseServiceImpl implements ViewPluginBaseService {
@Resource
private ChartViewService chartViewService;
private static final Logger logger = LoggerFactory.getLogger(ViewPluginBaseServiceImpl.class);
@Override
public PluginSingleField buildField(String dsType, PluginViewField pluginViewField, PluginViewSQL tableObj, int index) {
@ -80,12 +84,14 @@ public class ViewPluginBaseServiceImpl implements ViewPluginBaseService {
@Override
public String customWhere(String dsType, PluginFilterTreeObj obj, PluginViewSQL pluginViewSQL) {
logger.info("customWhere", gson.toJson(obj));
QueryProvider queryProvider = ProviderFactory.getQueryProvider(dsType);
String methodName = "transChartFilterTrees";
SQLObj sqlObj = BeanUtils.copyBean(SQLObj.builder().build(), pluginViewSQL);
FilterTreeObj filters = gson.fromJson(gson.toJson(obj), FilterTreeObj.class);
Object o;
if ((o = execProviderMethod(queryProvider, methodName, sqlObj, filters)) != null) {
logger.info("customWhereString", o);
return (String) o;
}
return null;

1
extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/handler/ChartMixViewStatHandler.java
View File

@ -60,6 +60,7 @@ public class ChartMixViewStatHandler implements PluginViewStatHandler {
// 处理视图中字段过滤
String customWheres = baseService.customWhere(dsType, pluginViewParam.getPluginChartFieldCustomFilters(), tableObj);
// 处理仪表板字段过滤
String panelWheres = baseService.panelWhere(dsType, pluginViewParam.getPluginChartExtFilters(), tableObj);
// 构建sql所有参数

1
sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/request/chart/filter/FilterTreeObj.java
View File

@ -5,6 +5,7 @@ import lombok.Data;
import java.util.List;
/**
* @Author Junjun
*/