From 84b44127df2d84c3b73cd5c1a152d2fd6e1a8110 Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 27 Jun 2024 16:51:26 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=9B=BE=E8=A1=A8SQL=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/chart/charts/AbstractChartHandler.java | 5 +++++ .../io/dataease/chart/charts/impl/DefaultChartHandler.java | 1 + .../java/io/dataease/chart/charts/impl/YoyChartHandler.java | 1 + .../java/io/dataease/chart/charts/impl/bar/BarHandler.java | 1 + .../java/io/dataease/chart/charts/impl/line/LineHandler.java | 1 + .../java/io/dataease/chart/charts/impl/mix/MixHandler.java | 1 + .../chart/charts/impl/numberic/NumbericChartHandler.java | 1 + .../dataease/chart/charts/impl/table/TableInfoHandler.java | 2 ++ 8 files changed, 13 insertions(+) diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/AbstractChartHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/AbstractChartHandler.java index e877f10436..cac108ab42 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/AbstractChartHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/AbstractChartHandler.java @@ -1,13 +1,18 @@ package io.dataease.chart.charts; +import io.dataease.chart.manage.ChartDataManage; import io.dataease.datasource.provider.CalciteProvider; import io.dataease.extensions.view.dto.*; import io.dataease.extensions.view.model.SQLMeta; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; import java.util.Map; public abstract class AbstractChartHandler { + public static Logger logger = LoggerFactory.getLogger(ChartDataManage.class); + public abstract T formatAxis(ChartViewDTO view); public abstract T customFilter(ChartViewDTO view, List filterList, K formatResult); public abstract T calcChartResult(ChartViewDTO view, AxisFormatResult formatResult, CustomFilterResult filterResult, Map sqlMap, SQLMeta sqlMeta, CalciteProvider provider); diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java index 2fe0da4fc9..a15ee21d18 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/DefaultChartHandler.java @@ -101,6 +101,7 @@ public class DefaultChartHandler extends AbstractChartHandler { String querySql = SQLProvider.createQuerySQL(sqlMeta, true, needOrder, view); querySql = SqlUtils.rebuildSQL(querySql, sqlMeta, crossDs, dsMap); datasourceRequest.setQuery(querySql); + logger.info("calcite chart sql: " + querySql); List data = (List) provider.fetchResultField(datasourceRequest).get("data"); //自定义排序 data = ChartDataUtil.resultCustomSort(xAxis, data); diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/YoyChartHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/YoyChartHandler.java index 9306cd546e..c0ef0fce8f 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/YoyChartHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/YoyChartHandler.java @@ -87,6 +87,7 @@ public class YoyChartHandler extends DefaultChartHandler { var request = new DatasourceRequest(); request.setDsList(dsMap); request.setQuery(originSql); + logger.info("calcite yoy sql: " + originSql); // 实际过滤后的数据 var originData = (List) provider.fetchResultField(request).get("data"); List resultData = new ArrayList<>(); diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/BarHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/BarHandler.java index c9c6756300..ca660b029e 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/BarHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/BarHandler.java @@ -55,6 +55,7 @@ public class BarHandler extends YoyChartHandler { req.setDsList(dsMap); var assistSql = assistSQL(originSql, assistFields); req.setQuery(assistSql); + logger.info("calcite assistSql sql: " + assistSql); var assistData = (List) provider.fetchResultField(req).get("data"); result.setAssistData(assistData); result.setDynamicAssistFields(dynamicAssistFields); diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/line/LineHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/line/LineHandler.java index ba09aa1a6c..5b6bdea40a 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/line/LineHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/line/LineHandler.java @@ -69,6 +69,7 @@ public class LineHandler extends YoyChartHandler { req.setDsList(dsMap); var assistSql = assistSQL(originSql, assistFields); req.setQuery(assistSql); + logger.info("calcite assistSql sql: " + assistSql); var assistData = (List) provider.fetchResultField(req).get("data"); result.setAssistData(assistData); result.setDynamicAssistFields(dynamicAssistFields); diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/MixHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/MixHandler.java index 7cb6271afa..2ae2088549 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/MixHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/MixHandler.java @@ -87,6 +87,7 @@ public class MixHandler extends YoyChartHandler { req.setDsList(dsMap); var assistSql = assistSQL(originSql, assistFields); req.setQuery(assistSql); + logger.info("calcite assistSql sql: " + assistSql); var assistData = (List) provider.fetchResultField(req).get("data"); leftResult.setAssistData(assistData); leftResult.setDynamicAssistFields(leftAssistFields); diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/numberic/NumbericChartHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/numberic/NumbericChartHandler.java index ed05aa9d89..263cb7d5bb 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/numberic/NumbericChartHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/numberic/NumbericChartHandler.java @@ -41,6 +41,7 @@ public class NumbericChartHandler extends DefaultChartHandler { String querySql = SQLProvider.createQuerySQL(sqlMeta, true, needOrder, view); querySql = SqlUtils.rebuildSQL(querySql, sqlMeta, crossDs, dsMap); datasourceRequest.setQuery(querySql); + logger.info("calcite chart sql: " + querySql); List data = (List) provider.fetchResultField(datasourceRequest).get("data"); boolean isdrill = filterResult .getFilterList() diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java index 1e58f9b4f3..c79a1cc246 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/table/TableInfoHandler.java @@ -97,6 +97,7 @@ public class TableInfoHandler extends DefaultChartHandler { totalPageSql = SqlUtils.rebuildSQL(totalPageSql, sqlMeta, crossDs, dsMap); datasourceRequest.setQuery(totalPageSql); datasourceRequest.setTotalPageFlag(true); + logger.info("calcite total sql: " + totalPageSql); List tmpData = (List) provider.fetchResultField(datasourceRequest).get("data"); var totalItems = ObjectUtils.isEmpty(tmpData) ? 0 : Long.valueOf(tmpData.get(0)[0]); if (StringUtils.equalsIgnoreCase(view.getResultMode(), "custom")) { @@ -109,6 +110,7 @@ public class TableInfoHandler extends DefaultChartHandler { querySql = SqlUtils.rebuildSQL(querySql, sqlMeta, crossDs, dsMap); datasourceRequest.setQuery(querySql); + logger.info("calcite chart sql: " + querySql); List data = (List) provider.fetchResultField(datasourceRequest).get("data"); //自定义排序 data = ChartDataUtil.resultCustomSort(xAxis, data);