From 7bee330836676c64a411967afe88fa4c63bfef14 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期一, 13 四月 2026 19:14:56 +0800
Subject: [PATCH] 24小时折线图-改为12小时折线图
---
src/main/java/com/zy/asrs/controller/OpenController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 9cfad2a..8179f5e 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -702,12 +702,12 @@
}
}
AxisBean inqty = new AxisBean();
- inqty.setName("鍏ュ簱鏁伴噺");
+ inqty.setName("鍏ュ簱鎵樼洏鏁�");
Integer[] array1 = new Integer[data1.size()];
inqty.setData(data1.toArray(array1));
list.add(inqty);
AxisBean outqty = new AxisBean();
- outqty.setName("鍑哄簱鏁伴噺");
+ outqty.setName("鍑哄簱TU");
Integer[] array2 = new Integer[data2.size()];
outqty.setData(data2.toArray(array2));
list.add(outqty);
@@ -717,7 +717,7 @@
}
/**
- * 杩�24灏忔椂鍏ュ嚭搴撴姌绾匡紙妯酱灏忔椂锛夛紝涓庢寜鏃� {@link #locIoLineCharts()} 鏁版嵁鍙ｅ緞涓嶅悓锛屼緵鐢佃鏈恒�屼綔涓氭晥鐜囥�嶄娇鐢�
+ * 鍏ュ嚭搴撴寜灏忔椂鎶樼嚎锛氭í杞翠负銆屽綋鍓嶆暣鐐硅捣鍚戝墠鍏� 12 灏忔椂銆嶆粴鍔ㄧ獥鍙ｏ紝涓庡簱琛� ymd锛坹yyy-MM-dd HH锛夊榻�
*/
@GetMapping("/line/charts/hourly")
public R locIoLineChartsHourly() {
@@ -733,17 +733,17 @@
ArrayList<Integer> data2 = new ArrayList<>();
List<String> categories = new ArrayList<>();
+ final int n = 12;
SimpleDateFormat sfKey = new SimpleDateFormat("yyyy-MM-dd HH");
- SimpleDateFormat sfLabel = new SimpleDateFormat("HH:00");
Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MILLISECOND, 0);
- calendar.add(Calendar.HOUR_OF_DAY, -23);
+ calendar.add(Calendar.HOUR_OF_DAY, -(n - 1));
- for (int i = 0; i < 24; i++) {
+ for (int i = 0; i < n; i++) {
String key = sfKey.format(calendar.getTime());
- categories.add(sfLabel.format(calendar.getTime()));
+ categories.add(String.valueOf(calendar.get(Calendar.HOUR_OF_DAY)));
int inV = 0;
int outV = 0;
@@ -760,13 +760,13 @@
}
AxisBean inqty = new AxisBean();
- inqty.setName("鍏ュ簱鏁伴噺");
+ inqty.setName("鍏ュ簱鎵樼洏鏁�");
Integer[] array1 = new Integer[data1.size()];
inqty.setData(data1.toArray(array1));
list.add(inqty);
AxisBean outqty = new AxisBean();
- outqty.setName("鍑哄簱鏁伴噺");
+ outqty.setName("鍑哄簱TU");
Integer[] array2 = new Integer[data2.size()];
outqty.setData(data2.toArray(array2));
list.add(outqty);
--
Gitblit v1.9.1