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 79bc875891..4c2ebe106b 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 @@ -1064,6 +1064,7 @@ public class ChartViewService { fieldMap.put("extBubble", extBubble); fieldMap.put("yAxis", yAxis); PluginViewParam pluginViewParam = buildPluginParam(fieldMap, fieldCustomFilter, extFilterList, ds, table, view, rowPermissionsTree, chartExtRequest); + logger.info("param1:" + gson.toJson(pluginViewParam)); String sql = pluginViewSql(pluginViewParam, view); if (StringUtils.isBlank(sql)) { return emptyChartViewDTO(view); 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 cbe4330bf6..c50d23905c 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 @@ -1,5 +1,6 @@ package io.dataease.plugins.view.official.handler; +import com.google.gson.Gson; import io.dataease.plugins.common.constants.datasource.SQLConstants; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.util.ConstantsUtil; @@ -9,6 +10,8 @@ import io.dataease.plugins.view.service.ViewPluginBaseService; import io.dataease.plugins.view.service.ViewPluginService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.stringtemplate.v4.ST; import org.stringtemplate.v4.STGroup; import org.stringtemplate.v4.STGroupFile; @@ -21,6 +24,9 @@ import java.util.stream.Collectors; public class ChartMixViewStatHandler implements PluginViewStatHandler { + private static final Logger logger = LoggerFactory.getLogger(ChartMixViewStatHandler.class); + private static final Gson gson = new Gson(); + @Override public String build(PluginViewParam pluginViewParam, ViewPluginService viewPluginService) { ViewPluginBaseService baseService = viewPluginService.getBaseService(); @@ -50,6 +56,8 @@ public class ChartMixViewStatHandler implements PluginViewStatHandler { List yOrders = fieldSQLMap.getOrDefault("yAxis", new ArrayList<>()).stream().filter(singleField -> ObjectUtils.isNotEmpty(singleField.getSort())).map(PluginSingleField::getSort).collect(Collectors.toList()); List yWheres = fieldSQLMap.getOrDefault("yAxis", new ArrayList<>()).stream().filter(singleField -> ObjectUtils.isNotEmpty(singleField.getWhere())).map(PluginSingleField::getWhere).collect(Collectors.toList()); + logger.info("xAxis:" + gson.toJson(xFields)); + logger.info("yAxis:" + gson.toJson(yFields)); /*List yExtFields = fieldSQLMap.getOrDefault("yAxisExt", new ArrayList<>()).stream().filter(singleField -> ObjectUtils.isNotEmpty(singleField.getField())).map(PluginSingleField::getField).collect(Collectors.toList()); List yExtOrders = fieldSQLMap.getOrDefault("yAxisExt", new ArrayList<>()).stream().filter(singleField -> ObjectUtils.isNotEmpty(singleField.getSort())).map(PluginSingleField::getSort).collect(Collectors.toList()); List yExtWheres = fieldSQLMap.getOrDefault("yAxisExt", new ArrayList<>()).stream().filter(singleField -> ObjectUtils.isNotEmpty(singleField.getWhere())).map(PluginSingleField::getWhere).collect(Collectors.toList()); diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/impl/ChartMixService.java b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/impl/ChartMixService.java index 22a60d2a62..f6e8b309fe 100644 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/impl/ChartMixService.java +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/impl/ChartMixService.java @@ -1,5 +1,6 @@ package io.dataease.plugins.view.official.impl; +import com.google.gson.Gson; import io.dataease.plugins.common.dto.StaticResource; import io.dataease.plugins.common.dto.chart.ChartFieldCompareDTO; import io.dataease.plugins.view.entity.*; @@ -8,6 +9,8 @@ import io.dataease.plugins.view.service.ViewPluginService; import org.apache.commons.collections4.CollectionUtils; 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 java.io.InputStream; @@ -18,6 +21,8 @@ import java.util.*; @Service public class ChartMixService extends ViewPluginService { + private static final Logger logger = LoggerFactory.getLogger(ViewPluginService.class); + private static final Gson gson = new Gson(); private static final String VIEW_TYPE_VALUE = "chart-mix"; /* 下版这些常量移到sdk */ @@ -101,6 +106,7 @@ public class ChartMixService extends ViewPluginService { @Override public String generateSQL(PluginViewParam param) { + logger.info("param:" + gson.toJson(param)); List xAxis = param.getFieldsByType("xAxis"); List yAxis = param.getFieldsByType("yAxis"); /*if (yAxis == null) {