From 7ef9826106fdb8c7fc06991f50c3d01fbce5e639 Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 28 Dec 2023 11:29:17 +0800 Subject: [PATCH] chore: log --- .../provider/engine/mysql/MysqlQueryProvider.java | 9 +++++++++ .../java/io/dataease/service/chart/ChartViewService.java | 2 -- .../service/chart/ViewPluginBaseServiceImpl.java | 3 +++ .../dataease/plugins/datasource/query/QueryProvider.java | 7 +++++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java index 12c5de1c14..8513bc4510 100644 --- a/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java @@ -1,6 +1,7 @@ package io.dataease.provider.engine.mysql; import com.alibaba.fastjson.JSONArray; +import com.google.gson.Gson; import io.dataease.i18n.Translator; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; import io.dataease.plugins.common.base.domain.DatasetTableField; @@ -30,6 +31,8 @@ import io.dataease.plugins.datasource.query.Utils; 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 org.stringtemplate.v4.ST; import org.stringtemplate.v4.STGroup; @@ -54,6 +57,10 @@ public class MysqlQueryProvider extends QueryProvider { @Resource private DatasetTableFieldMapper datasetTableFieldMapper; + private static Gson gson = new Gson(); + + private static final Logger logger = LoggerFactory.getLogger(MysqlQueryProvider.class); + @Override public Integer transFieldType(String field) { switch (field) { @@ -1042,6 +1049,7 @@ public class MysqlQueryProvider extends QueryProvider { @Override public String transTreeItem(SQLObj tableObj, FilterTreeItem item) { + logger.info("trans item:" + gson.toJson(item)); String res = null; DatasetTableField field = item.getField(); if (ObjectUtils.isEmpty(field)) { @@ -1112,6 +1120,7 @@ public class MysqlQueryProvider extends QueryProvider { .build(); res = build.getWhereField() + " " + build.getWhereTermAndValue(); } + logger.info("trans item result:" + res); return res; } 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 8affe6fe8d..d3c8a7f4a5 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,7 +1080,6 @@ 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); @@ -1612,7 +1611,6 @@ 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 3f1584c31c..d08c15ea22 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 @@ -89,6 +89,9 @@ public class ViewPluginBaseServiceImpl implements ViewPluginBaseService { String methodName = "transChartFilterTrees"; SQLObj sqlObj = BeanUtils.copyBean(SQLObj.builder().build(), pluginViewSQL); FilterTreeObj filters = gson.fromJson(gson.toJson(obj), FilterTreeObj.class); + logger.info("filters:" + gson.toJson(filters)); + Object o1 = execProviderMethod(queryProvider, methodName, sqlObj, filters); + logger.info("o1:" + (String) o1); Object o; if ((o = execProviderMethod(queryProvider, methodName, sqlObj, filters)) != null) { logger.info("customWhereString:" + o); diff --git a/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/query/QueryProvider.java b/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/query/QueryProvider.java index 8e962c885d..dc1559d756 100644 --- a/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/query/QueryProvider.java +++ b/sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/query/QueryProvider.java @@ -21,6 +21,8 @@ import io.dataease.plugins.datasource.entity.PageInfo; 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 java.text.SimpleDateFormat; import java.util.ArrayList; @@ -33,6 +35,9 @@ import java.util.stream.Collectors; * @Date 2021/5/17 2:42 下午 */ public abstract class QueryProvider { + private static final Logger logger = LoggerFactory.getLogger(QueryProvider.class); + + private static Gson gson = new Gson(); public abstract Integer transFieldType(String field); @@ -171,6 +176,7 @@ public abstract class QueryProvider { } public String transChartFilterTrees(SQLObj tableObj, FilterTreeObj tree) { + logger.info("trans begin:" + tree); List res = new ArrayList<>(); // permission trees // 解析每个tree，然后多个tree之间用and拼接 @@ -182,6 +188,7 @@ public abstract class QueryProvider { if (StringUtils.isNotEmpty(treeExp)) { res.add(treeExp); } + logger.info("trans end:" + gson.toJson(res)); return CollectionUtils.isNotEmpty(res) ? "(" + String.join(" AND ", res) + ")" : null; }