diff --git a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index d3c8a7f4a5..f5bba8451a 100644 --- a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -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 panelFilters = extFilters.stream().map(filter -> gson.fromJson(gson.toJson(filter), PluginChartExtFilter.class)).collect(Collectors.toList()); List pluginViewFields = fieldMap.entrySet().stream().flatMap(entry -> entry.getValue().stream().map(field -> { diff --git a/core/backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java b/core/backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java index 0f51808133..732742f1c9 100644 --- a/core/backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java +++ b/core/backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java @@ -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; diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/handler/ChartMixViewStatHandler.java b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/handler/ChartMixViewStatHandler.java index e90992814a..cbe4330bf6 100644 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/handler/ChartMixViewStatHandler.java +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/handler/ChartMixViewStatHandler.java @@ -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所有参数 diff --git a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/request/chart/filter/FilterTreeObj.java b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/request/chart/filter/FilterTreeObj.java index ca68cca94b..e9c9d14102 100644 --- a/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/request/chart/filter/FilterTreeObj.java +++ b/sdk/dataease-plugin-common/src/main/java/io/dataease/plugins/common/request/chart/filter/FilterTreeObj.java @@ -5,6 +5,7 @@ import lombok.Data; import java.util.List; + /** * @Author Junjun */