From 8ad75d5872872b79abada58589adad0df4614db6 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 07 十月 2026 11:59:44 +0800
Subject: [PATCH] fix(holiday): 走势图按年度配置截取假期天数
---
traffic-audit-server/src/main/java/com/trafficaudit/holiday/service/HolidayTrendChartService.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 0f06317..3b4357d 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
@@ -93,16 +93,21 @@
}
public byte[] lineChart(String yAxisLabel, List<ChartSeries> series, boolean percentAxis) {
- return lineChart(yAxisLabel, series, percentAxis, 1100, 590);
+ return lineChart(yAxisLabel, series, percentAxis, DAY_LABELS, 2, 1100, 590);
}
public byte[] lineChart(String yAxisLabel, List<ChartSeries> series, boolean percentAxis,
int width, int height) {
- return lineChart(yAxisLabel, series, percentAxis, 2, width, height);
+ return lineChart(yAxisLabel, series, percentAxis, DAY_LABELS, 2, width, height);
}
public byte[] lineChart(String yAxisLabel, List<ChartSeries> series, boolean percentAxis,
int valueDecimals, int width, int height) {
+ return lineChart(yAxisLabel, series, percentAxis, DAY_LABELS, valueDecimals, width, height);
+ }
+
+ public byte[] lineChart(String yAxisLabel, List<ChartSeries> series, boolean percentAxis,
+ List<String> dayLabels, int valueDecimals, int width, int height) {
XYSeriesCollection dataset = new XYSeriesCollection();
for (int seriesIndex = 0; seriesIndex < series.size(); seriesIndex++) {
ChartSeries item = series.get(seriesIndex);
@@ -132,7 +137,8 @@
plot.setRangeGridlinesVisible(false);
plot.setDomainTickBandPaint(null);
plot.setRangeTickBandPaint(null);
- SymbolAxis domainAxis = new SymbolAxis(null, DAY_LABELS.toArray(new String[0]));
+ List<String> axisLabels = dayLabels == null || dayLabels.isEmpty() ? DAY_LABELS : dayLabels;
+ SymbolAxis domainAxis = new SymbolAxis(null, axisLabels.toArray(new String[0]));
domainAxis.setGridBandPaint(new Color(0, 0, 0, 0));
domainAxis.setGridBandAlternatePaint(new Color(0, 0, 0, 0));
domainAxis.setLowerMargin(0.04);
--
Gitblit v1.9.1