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

Merge pull request #10604 from dataease/pr@dev-v2@chore_log

Browse Source 
chore: 图表SQL日志
This commit is contained in:
Junjun 2024-06-28 15:14:31 +08:00 committed by GitHub
commit 9fa1824b26
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/core-backend/src/main/java/io/dataease/chart/charts/AbstractChartHandler.java
View File

@ -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> T formatAxis(ChartViewDTO view);
public abstract <T extends CustomFilterResult, K extends AxisFormatResult> T customFilter(ChartViewDTO view, List<ChartExtFilterDTO> filterList, K formatResult);

1
core/core-backend/src/main/java/io/dataease/chart/charts/impl/line/StackAreaHandler.java
View File

@ -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<String[]>) provider.fetchResultField(req).get("data");
result.setAssistData(assistData);
result.setDynamicAssistFields(dynamicAssistFields);

2
core/core-backend/src/main/java/io/dataease/chart/charts/impl/map/SymbolicMapHandler.java
View File

@ -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<String[]> data = (List<String[]>) provider.fetchResultField(datasourceRequest).get("data");
// 获取所有字段数据作为数据详情返回
List<String[]> 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<String[]>) provider.fetchResultField(datasourceRequest).get("data");
}
//自定义排序

9
core/core-backend/src/main/java/io/dataease/dataset/utils/SqlUtils.java
View File

@ -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<Long, DatasourceSchemaDTO> dsMap) {
logger.info("calcite sql: " + sql);
if (crossDs) {
return sql;
}