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

Merge pull request #10588 from ulleo/dev-v2

Browse Source 
fix(图表): 修复柱线组合图查询结果不一致的问题
This commit is contained in:
ulleo 2024-06-28 11:14:44 +08:00 committed by GitHub
commit ea401b3427
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/GroupMixHandler.java
View File

@ -11,9 +11,9 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Component @Component
public class GroupMixHandler extends MixHandler{ public class GroupMixHandler extends MixHandler {
@Getter @Getter
private String type = "chart-mix-group"; private final String type = "chart-mix-group";
@Override @Override
public AxisFormatResult formatAxis(ChartViewDTO view) { public AxisFormatResult formatAxis(ChartViewDTO view) {
@ -21,7 +21,7 @@ public class GroupMixHandler extends MixHandler{
var context = new HashMap<String, Object>(); var context = new HashMap<String, Object>();
AxisFormatResult result = new AxisFormatResult(axisMap, context); AxisFormatResult result = new AxisFormatResult(axisMap, context);
//左轴分组子维度,非分组不需要 //左轴分组子维度,非分组不需要
axisMap.put(ChartAxis.xAxisExt,view.getXAxisExt()); axisMap.put(ChartAxis.xAxisExt, view.getXAxisExt());
//左轴堆叠子维度,非堆叠不需要 //左轴堆叠子维度,非堆叠不需要
axisMap.put(ChartAxis.extStack, Collections.emptyList()); axisMap.put(ChartAxis.extStack, Collections.emptyList());
//左轴指标 //左轴指标
@ -72,7 +72,7 @@ public class GroupMixHandler extends MixHandler{
rightFields.addAll(view.getYAxisExt()); rightFields.addAll(view.getYAxisExt());
var rightOriginData = rightCalcResult.getOriginData(); var rightOriginData = rightCalcResult.getOriginData();
var rightTable = ChartDataBuild.transTableNormal(rightFields, view, rightOriginData, desensitizationList); var rightTable = ChartDataBuild.transTableNormal(rightFields, view, rightOriginData, desensitizationList);
var rightData = new HashMap<String, Object>(leftTable); var rightData = new HashMap<String, Object>(rightTable);
rightData.putAll(rightCalcResult.getData()); rightData.putAll(rightCalcResult.getData());
rightData.put("dynamicAssistLines", rightCalcResult.getDynamicAssistFields()); rightData.put("dynamicAssistLines", rightCalcResult.getDynamicAssistFields());

7
core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/MixHandler.java
View File

@ -44,9 +44,8 @@ public class MixHandler extends YoyChartHandler {
axisMap.put(ChartAxis.extLabel, view.getExtLabel()); axisMap.put(ChartAxis.extLabel, view.getExtLabel());
axisMap.put(ChartAxis.extTooltip, view.getExtTooltip()); axisMap.put(ChartAxis.extTooltip, view.getExtTooltip());
//图表整体主维度 //图表整体主维度
var xAxis = new ArrayList<>(view.getXAxis()); axisMap.put(ChartAxis.xAxis, new ArrayList<>(view.getXAxis()));
axisMap.put(ChartAxis.xAxis, xAxis); context.put("xAxisBase", new ArrayList<>(view.getXAxis()));
context.put("xAxisBase", xAxis);
return result; return result;
} }
@ -159,7 +158,7 @@ public class MixHandler extends YoyChartHandler {
mergeAssistField(rightCalcResult.getDynamicAssistFields(), rightCalcResult.getAssistData()); mergeAssistField(rightCalcResult.getDynamicAssistFields(), rightCalcResult.getAssistData());
var rightOriginData = rightCalcResult.getOriginData(); var rightOriginData = rightCalcResult.getOriginData();
var rightTable = ChartDataBuild.transTableNormal(rightFields, view, rightOriginData, desensitizationList); var rightTable = ChartDataBuild.transTableNormal(rightFields, view, rightOriginData, desensitizationList);
var rightData = new HashMap<String, Object>(leftTable); var rightData = new HashMap<String, Object>(rightTable);
rightData.putAll(rightCalcResult.getData()); rightData.putAll(rightCalcResult.getData());
rightData.put("dynamicAssistLines", rightCalcResult.getDynamicAssistFields()); rightData.put("dynamicAssistLines", rightCalcResult.getDynamicAssistFields());

6
core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/StackMixHandler.java
View File

@ -11,9 +11,9 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Component @Component
public class StackMixHandler extends MixHandler{ public class StackMixHandler extends MixHandler {
@Getter @Getter
private String type = "chart-mix-stack"; private final String type = "chart-mix-stack";
@Override @Override
public AxisFormatResult formatAxis(ChartViewDTO view) { public AxisFormatResult formatAxis(ChartViewDTO view) {
@ -88,7 +88,7 @@ public class StackMixHandler extends MixHandler{
rightFields.addAll(view.getYAxisExt()); rightFields.addAll(view.getYAxisExt());
var rightOriginData = rightCalcResult.getOriginData(); var rightOriginData = rightCalcResult.getOriginData();
var rightTable = ChartDataBuild.transTableNormal(rightFields, view, rightOriginData, desensitizationList); var rightTable = ChartDataBuild.transTableNormal(rightFields, view, rightOriginData, desensitizationList);
var rightData = new HashMap<String, Object>(leftTable); var rightData = new HashMap<String, Object>(rightTable);
rightData.putAll(rightCalcResult.getData()); rightData.putAll(rightCalcResult.getData());
rightData.put("dynamicAssistLines", rightCalcResult.getDynamicAssistFields()); rightData.put("dynamicAssistLines", rightCalcResult.getDynamicAssistFields());