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

chore: log

Browse Source
This commit is contained in:
junjun 2023-12-28 10:58:24 +08:00
parent b666e1a093
commit 899f0ca2e5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -1080,7 +1080,7 @@ 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));
logger.info("PluginViewParam:" + gson.toJson(pluginViewParam));
String sql = pluginViewSql(pluginViewParam, view);
if (StringUtils.isBlank(sql)) {
return emptyChartViewDTO(view);
@ -1612,7 +1612,7 @@ public class ChartViewService {
PluginFilterTreeObj fieldFilters = gson.fromJson(gson.toJson(customFilters), PluginFilterTreeObj.class);
logger.info("PluginFilterTreeObj", gson.toJson(fieldFilters));
logger.info("PluginFilterTreeObj:" + gson.toJson(fieldFilters));
List<PluginChartExtFilter> panelFilters = extFilters.stream().map(filter -> gson.fromJson(gson.toJson(filter), PluginChartExtFilter.class)).collect(Collectors.toList());
List<PluginViewField> pluginViewFields = fieldMap.entrySet().stream().flatMap(entry -> entry.getValue().stream().map(field -> {

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

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