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

Merge pull request #8092 from dataease/pr@dev@refactor_log

Browse Source 
refactor: print sql to log
This commit is contained in:
Junjun 2024-02-20 17:28:44 +08:00 committed by GitHub
commit d648f2c8f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1064,7 +1064,6 @@ public class ChartViewService {
fieldMap.put("extBubble", extBubble);
fieldMap.put("yAxis", yAxis);
PluginViewParam pluginViewParam = buildPluginParam(fieldMap, fieldCustomFilter, extFilterList, ds, table, view, rowPermissionsTree, chartExtRequest);
logger.info("param1:" + gson.toJson(pluginViewParam));
String sql = pluginViewSql(pluginViewParam, view);
if (StringUtils.isBlank(sql)) {
return emptyChartViewDTO(view);
@ -1073,7 +1072,7 @@ public class ChartViewService {
data = datasourceProvider.getData(datasourceRequest);
Map<String, Object> mapChart = pluginViewResult(pluginViewParam, view, data, isDrill);
logger.info("sql:" + sql);
logger.info("plugin_sql:" + sql);
Map<String, Object> mapTableNormal = ChartDataBuild.transTableNormal(fieldMap, view, data, desensitizationList);
return uniteViewResult(datasourceRequest.getQuery(), mapChart, mapTableNormal, view, isDrill, drillFilters, dynamicAssistFields, assistData);

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

@ -6,7 +6,6 @@ import io.dataease.commons.model.PluginViewSetImpl;
import io.dataease.commons.utils.TableUtils;
import io.dataease.controller.request.chart.ChartExtRequest;
import io.dataease.dto.dataset.DataSetTableUnionDTO;
import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO;
import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs;
import io.dataease.plugins.common.base.domain.DatasetTableField;
import io.dataease.plugins.common.base.domain.Datasource;
@ -14,17 +13,18 @@ import io.dataease.plugins.common.constants.DatasetType;
import io.dataease.plugins.common.constants.datasource.SQLConstants;
import io.dataease.plugins.common.dto.chart.ChartViewFieldDTO;
import io.dataease.plugins.common.dto.chart.ChartViewFieldFilterDTO;
import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO;
import io.dataease.plugins.common.dto.sqlObj.SQLObj;
import io.dataease.plugins.common.request.chart.ChartExtFilterRequest;
import io.dataease.plugins.common.request.chart.filter.FilterTreeObj;
import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDTO;
import io.dataease.plugins.common.util.BeanUtils;
import io.dataease.plugins.common.util.ConstantsUtil;
import io.dataease.plugins.datasource.provider.ProviderFactory;
import io.dataease.plugins.datasource.query.QueryProvider;
import io.dataease.plugins.view.entity.*;
import io.dataease.plugins.view.entity.filter.PluginFilterTreeObj;
import io.dataease.plugins.view.service.ViewPluginBaseService;
import io.dataease.plugins.datasource.provider.ProviderFactory;
import io.dataease.service.dataset.DataSetTableService;
import io.dataease.service.dataset.DataSetTableUnionService;
import org.apache.commons.lang3.ObjectUtils;
@ -67,18 +67,26 @@ public class ViewPluginBaseServiceImpl implements ViewPluginBaseService {
String FIELD_ALIAS_PREFIX = StringUtils.equals(pluginViewField.getTypeField(), "xAxis") ? SQLConstants.FIELD_ALIAS_X_PREFIX : SQLConstants.FIELD_ALIAS_Y_PREFIX;
String originField = getOriginName(dsType, pluginViewField, tableObj);
logger.info("originField:" + gson.toJson(originField));
PluginViewSQL field;
String where;
String alias_fix = ConstantsUtil.constantsValue(dsType, "ALIAS_FIX");
logger.info("alias_fix:" + alias_fix);
String fieldAlias = String.format(alias_fix, String.format(FIELD_ALIAS_PREFIX, index));
field = getField(dsType, pluginViewField, originField, fieldAlias);
where = getWhere(dsType, pluginViewField, originField, fieldAlias);
PluginViewSQL sort = addSort(pluginViewField.getSort(), originField, fieldAlias);
logger.info("field:" + gson.toJson(field));
logger.info("where:" + where);
logger.info("sort:" + gson.toJson(sort));
Optional.ofNullable(field).ifPresent(f -> result.setField(f));
Optional.ofNullable(sort).ifPresent(s -> result.setSort(s));
Optional.ofNullable(where).ifPresent(w -> result.setWhere(w));
logger.info("result:" + gson.toJson(result));
return result;
}
@ -240,12 +248,19 @@ public class ViewPluginBaseServiceImpl implements ViewPluginBaseService {
private Object execProviderMethod(QueryProvider queryProvider, String methodName, Object... args) {
Method[] declaredMethods = queryProvider.getClass().getDeclaredMethods();
Method[] declaredAllMethods = queryProvider.getClass().getMethods();
for (Method method : declaredMethods) {
if (StringUtils.equals(method.getName(), methodName)) {
method.setAccessible(true);
return ReflectionUtils.invokeMethod(method, queryProvider, args);
}
}
for (Method method : declaredAllMethods) {
if (StringUtils.equals(method.getName(), methodName)) {
method.setAccessible(true);
return ReflectionUtils.invokeMethod(method, queryProvider, args);
}
}
return null;
}

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

@ -29,6 +29,7 @@ public class ChartMixViewStatHandler implements PluginViewStatHandler {
@Override
public String build(PluginViewParam pluginViewParam, ViewPluginService viewPluginService) {
logger.info("param:" + gson.toJson(pluginViewParam));
ViewPluginBaseService baseService = viewPluginService.getBaseService();
PluginViewSet pluginViewSet = pluginViewParam.getPluginViewSet();
List<DataSetRowPermissionsTreeDTO> rowPermissionsTree = pluginViewParam.getRowPermissionsTree();
@ -42,6 +43,7 @@ public class ChartMixViewStatHandler implements PluginViewStatHandler {
PluginViewField pluginViewField = pluginViewParam.getPluginViewFields().get(i);
String typeKey = pluginViewField.getTypeField();
PluginSingleField pluginSingleField = baseService.buildField(dsType, pluginViewField, tableObj, i);
logger.info("pluginSingleField:" + gson.toJson(pluginSingleField));
List<PluginSingleField> lists = fieldSQLMap.getOrDefault(typeKey, new ArrayList<>());
lists.add(pluginSingleField);
fieldSQLMap.put(typeKey, lists);

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

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