修复图形x轴时间跨界问题、交换机月收益不展示95值问题。

ipv4 ipv6增加子网卡统计
2025-12-16 17:56:49 +08:00
parent 6d3b5201e0
commit e818c0319e
6 changed files with 228 additions and 66 deletions
@@ -429,7 +429,18 @@ public class EchartsDataUtils {
            timeSeries.add(calendar.getTime());
            calendar.setTimeInMillis(calendar.getTimeInMillis() + interval);
        }
-        return timeSeries;
+        // 在generateFullTimeSeriesForMultiInterface方法的最后添加：
+        timeSeries.sort(Date::compareTo);
+        // 去重
+        List<Date> uniqueSeries = new ArrayList<>();
+        Date lastDate = null;
+        for (Date date : timeSeries) {
+            if (lastDate == null || !date.equals(lastDate)) {
+                uniqueSeries.add(date);
+                lastDate = date;
+            }
+        }
+        return uniqueSeries;
    }

    /**
@@ -214,8 +214,18 @@ public class EchartsMoreDataUtils {
                fullTimeSeries.addAll(afterSeries);
            }
        }
-
-        return fullTimeSeries;
+        // 在generateFullTimeSeriesForMultiInterface方法的最后添加：
+        fullTimeSeries.sort(Date::compareTo);
+        // 去重
+        List<Date> uniqueSeries = new ArrayList<>();
+        Date lastDate = null;
+        for (Date date : fullTimeSeries) {
+            if (lastDate == null || !date.equals(lastDate)) {
+                uniqueSeries.add(date);
+                lastDate = date;
+            }
+        }
+        return uniqueSeries;
    }

    /**