From 23fab39fddc350b82231c5eb27298a719aef72b5 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 07 十月 2026 09:13:31 +0800
Subject: [PATCH] docs(交接): 补充 10-07 上午国省道调整更正与新会话接手说明
---
traffic-audit-server/src/main/java/com/trafficaudit/holiday/service/HolidayTrendChartService.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/traffic-audit-server/src/main/java/com/trafficaudit/holiday/service/HolidayTrendChartService.java b/traffic-audit-server/src/main/java/com/trafficaudit/holiday/service/HolidayTrendChartService.java
index e0b9c88..47bd7ca 100644
--- a/traffic-audit-server/src/main/java/com/trafficaudit/holiday/service/HolidayTrendChartService.java
+++ b/traffic-audit-server/src/main/java/com/trafficaudit/holiday/service/HolidayTrendChartService.java
@@ -49,6 +49,7 @@
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.ArrayList;
@@ -76,6 +77,8 @@
private static final double RIGHT_LABEL_BAND = 74.0;
private static final double ITEM_LABEL_GAP = 10.0;
private static final float HALO_OUTLINE_WIDTH = 4.0f;
+ private static final int PERCENT_ITEM_LABEL_DECIMALS = 1;
+ private static final double LINE_CHART_HEIGHT_SCALE = 1.20;
private static final Color ITEM_LABEL_COLOR = new Color(55, 55, 55);
private static final Color[] SERIES_COLORS = {
new Color(192, 80, 77),
@@ -107,7 +110,7 @@
for (int i = 0; i < item.getValues().size(); i++) {
BigDecimal value = item.getValues().get(i);
if (value != null) {
- xySeries.add(i, value.doubleValue());
+ xySeries.add(i, displayValue(value, percentAxis, valueDecimals).doubleValue());
}
}
dataset.addSeries(xySeries);
@@ -139,8 +142,8 @@
NumberAxis rangeAxis = new NumberAxis();
rangeAxis.setAutoRangeIncludesZero(false);
- rangeAxis.setLowerMargin(0.12);
- rangeAxis.setUpperMargin(0.16);
+ rangeAxis.setLowerMargin(0.04);
+ rangeAxis.setUpperMargin(0.07);
rangeAxis.setTickLabelFont(TICK_FONT);
rangeAxis.setLabelFont(LABEL_FONT);
rangeAxis.setTickLabelPaint(MUTED_TEXT_COLOR);
@@ -171,7 +174,8 @@
BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
}
plot.setRenderer(renderer);
- return render(chart, width, height, yAxisLabel, true, percentAxis, valueDecimals);
+ return render(chart, width, scaleLineChartHeight(height),
+ yAxisLabel, true, percentAxis, valueDecimals);
}
public byte[] pieChart(String valueSuffix, List<ChartCategory> categories,
@@ -1113,10 +1117,24 @@
return total;
}
+ static int scaleLineChartHeight(int height) {
+ return (int) Math.round(height * LINE_CHART_HEIGHT_SCALE);
+ }
+
+ static long scaleLineChartHeight(long height) {
+ return Math.round(height * LINE_CHART_HEIGHT_SCALE);
+ }
+
+ static BigDecimal displayValue(BigDecimal value, boolean percentItemLabels, int valueDecimals) {
+ if (value == null) return null;
+ int scale = percentItemLabels ? PERCENT_ITEM_LABEL_DECIMALS + 2 : valueDecimals;
+ return value.setScale(scale, RoundingMode.HALF_UP);
+ }
+
private String formatLineLabel(Number value, boolean percentItemLabels, int valueDecimals) {
if (percentItemLabels) {
NumberFormat formatter = NumberFormat.getPercentInstance();
- formatter.setMaximumFractionDigits(1);
+ formatter.setMaximumFractionDigits(PERCENT_ITEM_LABEL_DECIMALS);
return formatter.format(value.doubleValue());
}
DecimalFormat formatter = new DecimalFormat("#,##0");
--
Gitblit v1.9.1