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

refactor: print sql to log

Browse Source
This commit is contained in:
junjun 2024-02-20 16:24:17 +08:00
parent 6b96fc7a93
commit d49d4868f1
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1064,6 +1064,7 @@ public class ChartViewService {
fieldMap.put("extBubble", extBubble); fieldMap.put("extBubble", extBubble);
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("param1:" + 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);

8
extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/handler/ChartMixViewStatHandler.java
View File

@ -1,5 +1,6 @@
package io.dataease.plugins.view.official.handler; package io.dataease.plugins.view.official.handler;
import com.google.gson.Gson;
import io.dataease.plugins.common.constants.datasource.SQLConstants; import io.dataease.plugins.common.constants.datasource.SQLConstants;
import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO; import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO;
import io.dataease.plugins.common.util.ConstantsUtil; import io.dataease.plugins.common.util.ConstantsUtil;
@ -9,6 +10,8 @@ import io.dataease.plugins.view.service.ViewPluginBaseService;
import io.dataease.plugins.view.service.ViewPluginService; import io.dataease.plugins.view.service.ViewPluginService;
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.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.stringtemplate.v4.ST; import org.stringtemplate.v4.ST;
import org.stringtemplate.v4.STGroup; import org.stringtemplate.v4.STGroup;
import org.stringtemplate.v4.STGroupFile; import org.stringtemplate.v4.STGroupFile;
@ -21,6 +24,9 @@ import java.util.stream.Collectors;
public class ChartMixViewStatHandler implements PluginViewStatHandler { public class ChartMixViewStatHandler implements PluginViewStatHandler {
private static final Logger logger = LoggerFactory.getLogger(ChartMixViewStatHandler.class);
private static final Gson gson = new Gson();
@Override @Override
public String build(PluginViewParam pluginViewParam, ViewPluginService viewPluginService) { public String build(PluginViewParam pluginViewParam, ViewPluginService viewPluginService) {
ViewPluginBaseService baseService = viewPluginService.getBaseService(); ViewPluginBaseService baseService = viewPluginService.getBaseService();
@ -50,6 +56,8 @@ public class ChartMixViewStatHandler implements PluginViewStatHandler {
List<PluginViewSQL> yOrders = fieldSQLMap.getOrDefault("yAxis", new ArrayList<>()).stream().filter(singleField -> ObjectUtils.isNotEmpty(singleField.getSort())).map(PluginSingleField::getSort).collect(Collectors.toList()); List<PluginViewSQL> yOrders = fieldSQLMap.getOrDefault("yAxis", new ArrayList<>()).stream().filter(singleField -> ObjectUtils.isNotEmpty(singleField.getSort())).map(PluginSingleField::getSort).collect(Collectors.toList());
List<String> yWheres = fieldSQLMap.getOrDefault("yAxis", new ArrayList<>()).stream().filter(singleField -> ObjectUtils.isNotEmpty(singleField.getWhere())).map(PluginSingleField::getWhere).collect(Collectors.toList()); List<String> yWheres = fieldSQLMap.getOrDefault("yAxis", new ArrayList<>()).stream().filter(singleField -> ObjectUtils.isNotEmpty(singleField.getWhere())).map(PluginSingleField::getWhere).collect(Collectors.toList());
logger.info("xAxis:" + gson.toJson(xFields));
logger.info("yAxis:" + gson.toJson(yFields));
/*List<PluginViewSQL> yExtFields = fieldSQLMap.getOrDefault("yAxisExt", new ArrayList<>()).stream().filter(singleField -> ObjectUtils.isNotEmpty(singleField.getField())).map(PluginSingleField::getField).collect(Collectors.toList()); /*List<PluginViewSQL> yExtFields = fieldSQLMap.getOrDefault("yAxisExt", new ArrayList<>()).stream().filter(singleField -> ObjectUtils.isNotEmpty(singleField.getField())).map(PluginSingleField::getField).collect(Collectors.toList());
List<PluginViewSQL> yExtOrders = fieldSQLMap.getOrDefault("yAxisExt", new ArrayList<>()).stream().filter(singleField -> ObjectUtils.isNotEmpty(singleField.getSort())).map(PluginSingleField::getSort).collect(Collectors.toList()); List<PluginViewSQL> yExtOrders = fieldSQLMap.getOrDefault("yAxisExt", new ArrayList<>()).stream().filter(singleField -> ObjectUtils.isNotEmpty(singleField.getSort())).map(PluginSingleField::getSort).collect(Collectors.toList());
List<String> yExtWheres = fieldSQLMap.getOrDefault("yAxisExt", new ArrayList<>()).stream().filter(singleField -> ObjectUtils.isNotEmpty(singleField.getWhere())).map(PluginSingleField::getWhere).collect(Collectors.toList()); List<String> yExtWheres = fieldSQLMap.getOrDefault("yAxisExt", new ArrayList<>()).stream().filter(singleField -> ObjectUtils.isNotEmpty(singleField.getWhere())).map(PluginSingleField::getWhere).collect(Collectors.toList());

6
extensions/dataease-extensions-view/view-chartmix/view-chartmix-backend/src/main/java/io/dataease/plugins/view/official/impl/ChartMixService.java
View File

@ -1,5 +1,6 @@
package io.dataease.plugins.view.official.impl; package io.dataease.plugins.view.official.impl;
import com.google.gson.Gson;
import io.dataease.plugins.common.dto.StaticResource; import io.dataease.plugins.common.dto.StaticResource;
import io.dataease.plugins.common.dto.chart.ChartFieldCompareDTO; import io.dataease.plugins.common.dto.chart.ChartFieldCompareDTO;
import io.dataease.plugins.view.entity.*; import io.dataease.plugins.view.entity.*;
@ -8,6 +9,8 @@ import io.dataease.plugins.view.service.ViewPluginService;
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 java.io.InputStream; import java.io.InputStream;
@ -18,6 +21,8 @@ import java.util.*;
@Service @Service
public class ChartMixService extends ViewPluginService { public class ChartMixService extends ViewPluginService {
private static final Logger logger = LoggerFactory.getLogger(ViewPluginService.class);
private static final Gson gson = new Gson();
private static final String VIEW_TYPE_VALUE = "chart-mix"; private static final String VIEW_TYPE_VALUE = "chart-mix";
/* 下版这些常量移到sdk */ /* 下版这些常量移到sdk */
@ -101,6 +106,7 @@ public class ChartMixService extends ViewPluginService {
@Override @Override
public String generateSQL(PluginViewParam param) { public String generateSQL(PluginViewParam param) {
logger.info("param:" + gson.toJson(param));
List<PluginViewField> xAxis = param.getFieldsByType("xAxis"); List<PluginViewField> xAxis = param.getFieldsByType("xAxis");
List<PluginViewField> yAxis = param.getFieldsByType("yAxis"); List<PluginViewField> yAxis = param.getFieldsByType("yAxis");
/*if (yAxis == null) { /*if (yAxis == null) {