forked from github/dataease
chore: log
This commit is contained in:
parent
497e85833d
commit
b666e1a093
@ -1080,6 +1080,7 @@ public class ChartViewService {
|
|||||||
fieldMap.put("xAxis", xAxis);
|
fieldMap.put("xAxis", xAxis);
|
||||||
fieldMap.put("yAxis", yAxis);
|
fieldMap.put("yAxis", yAxis);
|
||||||
PluginViewParam pluginViewParam = buildPluginParam(fieldMap, fieldCustomFilter, extFilterList, ds, table, view, rowPermissionsTree, chartExtRequest);
|
PluginViewParam pluginViewParam = buildPluginParam(fieldMap, fieldCustomFilter, extFilterList, ds, table, view, rowPermissionsTree, chartExtRequest);
|
||||||
|
logger.info("PluginViewParam", gson.toJson(pluginViewParam));
|
||||||
String sql = pluginViewSql(pluginViewParam, view);
|
String sql = pluginViewSql(pluginViewParam, view);
|
||||||
if (StringUtils.isBlank(sql)) {
|
if (StringUtils.isBlank(sql)) {
|
||||||
return emptyChartViewDTO(view);
|
return emptyChartViewDTO(view);
|
||||||
@ -1611,6 +1612,7 @@ public class ChartViewService {
|
|||||||
|
|
||||||
|
|
||||||
PluginFilterTreeObj fieldFilters = gson.fromJson(gson.toJson(customFilters), PluginFilterTreeObj.class);
|
PluginFilterTreeObj fieldFilters = gson.fromJson(gson.toJson(customFilters), PluginFilterTreeObj.class);
|
||||||
|
logger.info("PluginFilterTreeObj", gson.toJson(fieldFilters));
|
||||||
List<PluginChartExtFilter> panelFilters = extFilters.stream().map(filter -> gson.fromJson(gson.toJson(filter), PluginChartExtFilter.class)).collect(Collectors.toList());
|
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 -> {
|
List<PluginViewField> pluginViewFields = fieldMap.entrySet().stream().flatMap(entry -> entry.getValue().stream().map(field -> {
|
||||||
|
@ -30,6 +30,8 @@ import io.dataease.service.dataset.DataSetTableService;
|
|||||||
import io.dataease.service.dataset.DataSetTableUnionService;
|
import io.dataease.service.dataset.DataSetTableUnionService;
|
||||||
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 javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
@ -56,6 +58,8 @@ public class ViewPluginBaseServiceImpl implements ViewPluginBaseService {
|
|||||||
@Resource
|
@Resource
|
||||||
private ChartViewService chartViewService;
|
private ChartViewService chartViewService;
|
||||||
|
|
||||||
|
private static final Logger logger = LoggerFactory.getLogger(ViewPluginBaseServiceImpl.class);
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PluginSingleField buildField(String dsType, PluginViewField pluginViewField, PluginViewSQL tableObj, int index) {
|
public PluginSingleField buildField(String dsType, PluginViewField pluginViewField, PluginViewSQL tableObj, int index) {
|
||||||
@ -80,12 +84,14 @@ 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);
|
||||||
Object o;
|
Object o;
|
||||||
if ((o = execProviderMethod(queryProvider, methodName, sqlObj, filters)) != null) {
|
if ((o = execProviderMethod(queryProvider, methodName, sqlObj, filters)) != null) {
|
||||||
|
logger.info("customWhereString", o);
|
||||||
return (String) o;
|
return (String) o;
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
|
@ -60,6 +60,7 @@ public class ChartMixViewStatHandler implements PluginViewStatHandler {
|
|||||||
|
|
||||||
// 处理视图中字段过滤
|
// 处理视图中字段过滤
|
||||||
String customWheres = baseService.customWhere(dsType, pluginViewParam.getPluginChartFieldCustomFilters(), tableObj);
|
String customWheres = baseService.customWhere(dsType, pluginViewParam.getPluginChartFieldCustomFilters(), tableObj);
|
||||||
|
|
||||||
// 处理仪表板字段过滤
|
// 处理仪表板字段过滤
|
||||||
String panelWheres = baseService.panelWhere(dsType, pluginViewParam.getPluginChartExtFilters(), tableObj);
|
String panelWheres = baseService.panelWhere(dsType, pluginViewParam.getPluginChartExtFilters(), tableObj);
|
||||||
// 构建sql所有参数
|
// 构建sql所有参数
|
||||||
|
@ -5,6 +5,7 @@ import lombok.Data;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Author Junjun
|
* @Author Junjun
|
||||||
*/
|
*/
|
||||||
|
Loading…
Reference in New Issue
Block a user