From edf384b84991f8cf23d3395de543b812f4ca67aa Mon Sep 17 00:00:00 2001 From: junjun Date: Fri, 28 Jun 2024 15:12:39 +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 --- .../io/dataease/chart/charts/AbstractChartHandler.java | 3 +-- .../chart/charts/impl/line/StackAreaHandler.java | 1 + .../chart/charts/impl/map/SymbolicMapHandler.java | 2 ++ .../main/java/io/dataease/dataset/utils/SqlUtils.java | 9 +++++++-- 4 files changed, 11 insertions(+), 4 deletions(-) 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 cac108ab42..c552e6a3bc 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,6 +1,5 @@ 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; @@ -11,7 +10,7 @@ import java.util.List; import java.util.Map; public abstract class AbstractChartHandler { - public static Logger logger = LoggerFactory.getLogger(ChartDataManage.class); + public static Logger logger = LoggerFactory.getLogger(AbstractChartHandler.class); public abstract T formatAxis(ChartViewDTO view); public abstract T customFilter(ChartViewDTO view, List filterList, K formatResult); diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/line/StackAreaHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/line/StackAreaHandler.java index 4aab2ce17b..2e1d9d3aa2 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/line/StackAreaHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/line/StackAreaHandler.java @@ -101,6 +101,7 @@ public class StackAreaHandler extends YoyChartHandler { req.setDsList(dsMap); var assistSql = assistSQL(originSql, assistFields); req.setQuery(assistSql); + logger.info("calcite assist 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/map/SymbolicMapHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/SymbolicMapHandler.java index c18b893ab8..e25c0939ff 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/SymbolicMapHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/SymbolicMapHandler.java @@ -73,6 +73,7 @@ public class SymbolicMapHandler extends GroupChartHandler { 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"); // 获取所有字段数据作为数据详情返回 List detailData = new ArrayList<>(); @@ -88,6 +89,7 @@ public class SymbolicMapHandler extends GroupChartHandler { String originSql = SQLProvider.createQuerySQL(sqlMeta1, false, needOrder, view); originSql = SqlUtils.rebuildSQL(originSql, sqlMeta, crossDs, dsMap); datasourceRequest.setQuery(originSql); + logger.info("calcite detail field sql: " + querySql); detailData = (List) provider.fetchResultField(datasourceRequest).get("data"); } //自定义排序 diff --git a/core/core-backend/src/main/java/io/dataease/dataset/utils/SqlUtils.java b/core/core-backend/src/main/java/io/dataease/dataset/utils/SqlUtils.java index 7e56d65e99..f638be3ab7 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/utils/SqlUtils.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/utils/SqlUtils.java @@ -1,17 +1,19 @@ package io.dataease.dataset.utils; import com.google.common.collect.ImmutableList; -import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; -import io.dataease.extensions.view.model.SQLMeta; import io.dataease.api.ds.vo.DatasourceConfiguration; import io.dataease.engine.constant.SqlPlaceholderConstants; import io.dataease.exception.DEException; +import io.dataease.extensions.datasource.dto.DatasourceSchemaDTO; +import io.dataease.extensions.view.model.SQLMeta; import org.apache.calcite.config.Lex; import org.apache.calcite.sql.*; import org.apache.calcite.sql.dialect.*; import org.apache.calcite.sql.parser.SqlParseException; import org.apache.calcite.sql.parser.SqlParser; import org.apache.commons.collections4.MapUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.HashMap; import java.util.List; @@ -24,6 +26,8 @@ import static org.apache.calcite.sql.SqlKind.*; * @Author Junjun */ public class SqlUtils { + public static Logger logger = LoggerFactory.getLogger(SqlUtils.class); + public static String addSchema(String sql, String schema) { if (sql.trim().endsWith(";")) { sql = sql.substring(0, sql.length() - 1); @@ -118,6 +122,7 @@ public class SqlUtils { } public static String rebuildSQL(String sql, SQLMeta sqlMeta, boolean crossDs, Map dsMap) { + logger.info("calcite sql: " + sql); if (crossDs) { return sql; }