dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7438 from dataease/pr@dev@chore_remove_log

Browse Source 
chore: remove log
This commit is contained in:
Junjun 2023-12-28 12:04:18 +08:00 committed by GitHub
commit 4f33987711
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java
View File

@ -1,7 +1,6 @@
package io.dataease.provider.engine.mysql; package io.dataease.provider.engine.mysql;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.google.gson.Gson;
import io.dataease.i18n.Translator; import io.dataease.i18n.Translator;
import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs;
import io.dataease.plugins.common.base.domain.DatasetTableField; import io.dataease.plugins.common.base.domain.DatasetTableField;
@ -31,8 +30,6 @@ import io.dataease.plugins.datasource.query.Utils;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.stringtemplate.v4.ST; import org.stringtemplate.v4.ST;
import org.stringtemplate.v4.STGroup; import org.stringtemplate.v4.STGroup;
@ -57,10 +54,6 @@ public class MysqlQueryProvider extends QueryProvider {
@Resource @Resource
private DatasetTableFieldMapper datasetTableFieldMapper; private DatasetTableFieldMapper datasetTableFieldMapper;
private static Gson gson = new Gson();
private static final Logger logger = LoggerFactory.getLogger(MysqlQueryProvider.class);
@Override @Override
public Integer transFieldType(String field) { public Integer transFieldType(String field) {
switch (field) { switch (field) {
@ -1049,7 +1042,6 @@ public class MysqlQueryProvider extends QueryProvider {
@Override @Override
public String transTreeItem(SQLObj tableObj, FilterTreeItem item) { public String transTreeItem(SQLObj tableObj, FilterTreeItem item) {
logger.info("trans item:" + gson.toJson(item));
String res = null; String res = null;
DatasetTableField field = item.getField(); DatasetTableField field = item.getField();
if (ObjectUtils.isEmpty(field)) { if (ObjectUtils.isEmpty(field)) {
@ -1120,7 +1112,6 @@ public class MysqlQueryProvider extends QueryProvider {
.build(); .build();
res = build.getWhereField() + " " + build.getWhereTermAndValue(); res = build.getWhereField() + " " + build.getWhereTermAndValue();
} }
logger.info("trans item result:" + res);
return res; return res;
} }

5
core/backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java
View File

@ -84,17 +84,12 @@ public class ViewPluginBaseServiceImpl implements ViewPluginBaseService {
@Override @Override
public String customWhere(String dsType, PluginFilterTreeObj obj, PluginViewSQL pluginViewSQL) { public String customWhere(String dsType, PluginFilterTreeObj obj, PluginViewSQL pluginViewSQL) {
logger.info("customWhere:" + gson.toJson(obj));
QueryProvider queryProvider = ProviderFactory.getQueryProvider(dsType); QueryProvider queryProvider = ProviderFactory.getQueryProvider(dsType);
String methodName = "transChartFilterTrees"; String methodName = "transChartFilterTrees";
SQLObj sqlObj = BeanUtils.copyBean(SQLObj.builder().build(), pluginViewSQL); SQLObj sqlObj = BeanUtils.copyBean(SQLObj.builder().build(), pluginViewSQL);
FilterTreeObj filters = gson.fromJson(gson.toJson(obj), FilterTreeObj.class); FilterTreeObj filters = gson.fromJson(gson.toJson(obj), FilterTreeObj.class);
logger.info("filters:" + gson.toJson(filters));
Object o1 = execProviderSuperMethod(queryProvider, methodName, sqlObj, filters);
logger.info("o1:" + (String) o1);
Object o; Object o;
if ((o = execProviderSuperMethod(queryProvider, methodName, sqlObj, filters)) != null) { if ((o = execProviderSuperMethod(queryProvider, methodName, sqlObj, filters)) != null) {
logger.info("customWhereString:" + o);
return (String) o; return (String) o;
} }
return null; return null;

8
sdk/dataease-plugin-datasource/src/main/java/io/dataease/plugins/datasource/query/QueryProvider.java
View File

@ -21,8 +21,6 @@ import io.dataease.plugins.datasource.entity.PageInfo;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
@ -35,10 +33,6 @@ import java.util.stream.Collectors;
* @Date 2021/5/17 2:42 下午 * @Date 2021/5/17 2:42 下午
*/ */
public abstract class QueryProvider { 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); public abstract Integer transFieldType(String field);
public abstract String createSQLPreview(String sql, String orderBy); public abstract String createSQLPreview(String sql, String orderBy);
@ -176,7 +170,6 @@ public abstract class QueryProvider {
} }
public String transChartFilterTrees(SQLObj tableObj, FilterTreeObj tree) { public String transChartFilterTrees(SQLObj tableObj, FilterTreeObj tree) {
logger.info("trans begin:" + tree);
List<String> res = new ArrayList<>(); List<String> res = new ArrayList<>();
// permission trees // permission trees
// 解析每个tree，然后多个tree之间用and拼接 // 解析每个tree，然后多个tree之间用and拼接
@ -188,7 +181,6 @@ public abstract class QueryProvider {
if (StringUtils.isNotEmpty(treeExp)) { if (StringUtils.isNotEmpty(treeExp)) {
res.add(treeExp); res.add(treeExp);
} }
logger.info("trans end:" + gson.toJson(res));
return CollectionUtils.isNotEmpty(res) ? "(" + String.join(" AND ", res) + ")" : null; return CollectionUtils.isNotEmpty(res) ? "(" + String.join(" AND ", res) + ")" : null;
} }