diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/GroupMixHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/GroupMixHandler.java index bda99c3178..4fb3f256dd 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/GroupMixHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/GroupMixHandler.java @@ -11,9 +11,9 @@ import java.util.*; import java.util.stream.Collectors; @Component -public class GroupMixHandler extends MixHandler{ +public class GroupMixHandler extends MixHandler { @Getter - private String type = "chart-mix-group"; + private final String type = "chart-mix-group"; @Override public AxisFormatResult formatAxis(ChartViewDTO view) { @@ -21,7 +21,7 @@ public class GroupMixHandler extends MixHandler{ var context = new HashMap(); AxisFormatResult result = new AxisFormatResult(axisMap, context); //左轴分组子维度,非分组不需要 - axisMap.put(ChartAxis.xAxisExt,view.getXAxisExt()); + axisMap.put(ChartAxis.xAxisExt, view.getXAxisExt()); //左轴堆叠子维度,非堆叠不需要 axisMap.put(ChartAxis.extStack, Collections.emptyList()); //左轴指标 @@ -72,7 +72,7 @@ public class GroupMixHandler extends MixHandler{ rightFields.addAll(view.getYAxisExt()); var rightOriginData = rightCalcResult.getOriginData(); var rightTable = ChartDataBuild.transTableNormal(rightFields, view, rightOriginData, desensitizationList); - var rightData = new HashMap(leftTable); + var rightData = new HashMap(rightTable); rightData.putAll(rightCalcResult.getData()); rightData.put("dynamicAssistLines", rightCalcResult.getDynamicAssistFields()); diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/MixHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/MixHandler.java index 2ae2088549..fd46a0f4c7 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/MixHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/MixHandler.java @@ -44,9 +44,8 @@ public class MixHandler extends YoyChartHandler { axisMap.put(ChartAxis.extLabel, view.getExtLabel()); axisMap.put(ChartAxis.extTooltip, view.getExtTooltip()); //图表整体主维度 - var xAxis = new ArrayList<>(view.getXAxis()); - axisMap.put(ChartAxis.xAxis, xAxis); - context.put("xAxisBase", xAxis); + axisMap.put(ChartAxis.xAxis, new ArrayList<>(view.getXAxis())); + context.put("xAxisBase", new ArrayList<>(view.getXAxis())); return result; } @@ -159,7 +158,7 @@ public class MixHandler extends YoyChartHandler { mergeAssistField(rightCalcResult.getDynamicAssistFields(), rightCalcResult.getAssistData()); var rightOriginData = rightCalcResult.getOriginData(); var rightTable = ChartDataBuild.transTableNormal(rightFields, view, rightOriginData, desensitizationList); - var rightData = new HashMap(leftTable); + var rightData = new HashMap(rightTable); rightData.putAll(rightCalcResult.getData()); rightData.put("dynamicAssistLines", rightCalcResult.getDynamicAssistFields()); diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/StackMixHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/StackMixHandler.java index e2331c9216..3dd319e2cd 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/StackMixHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/StackMixHandler.java @@ -11,9 +11,9 @@ import java.util.*; import java.util.stream.Collectors; @Component -public class StackMixHandler extends MixHandler{ +public class StackMixHandler extends MixHandler { @Getter - private String type = "chart-mix-stack"; + private final String type = "chart-mix-stack"; @Override public AxisFormatResult formatAxis(ChartViewDTO view) { @@ -88,7 +88,7 @@ public class StackMixHandler extends MixHandler{ rightFields.addAll(view.getYAxisExt()); var rightOriginData = rightCalcResult.getOriginData(); var rightTable = ChartDataBuild.transTableNormal(rightFields, view, rightOriginData, desensitizationList); - var rightData = new HashMap(leftTable); + var rightData = new HashMap(rightTable); rightData.putAll(rightCalcResult.getData()); rightData.put("dynamicAssistLines", rightCalcResult.getDynamicAssistFields());