From 88b41b938164a5b62ed0a31cd6d8876a2a934776 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 16 五月 2022 16:17:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
index ee55573..664566b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
@@ -41,10 +41,9 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -294,9 +293,13 @@
}
}
- Integer week = now.getDayOfWeek().getValue();
- Map map = new HashMap();
+ //鑾峰彇褰撳墠鏄熸湡鍑� 1-7
+
+ int week = now.getDayOfWeek().getValue();
+ Map map = new LinkedHashMap();
+ //鑾峰彇鏃ユ湡 绮剧‘鍒板ぉ
+ LocalDateTime localDateTime = now.with(LocalTime.MIN);
for (int i = 1; i < 8; i++) {
@@ -304,7 +307,8 @@
if (week < 1) {
week = 7;
}
- map.put(i, getlist(week));
+ String format = localDateTime.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ map.put(localDateTime.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")), getlist(week));
}
@@ -363,7 +367,9 @@
Integer week = now.getDayOfWeek().getValue();
- Map map = new HashMap();
+ Map map = new LinkedHashMap();
+ //鑾峰彇褰撳墠鏃ユ湡 鏍煎紡涓簓yyy-MM-dd
+ LocalDateTime localDateTime = now.with(LocalTime.MIN);
for (int i = 1; i < 8; i++) {
@@ -371,7 +377,7 @@
if (week < 1) {
week = 7;
}
- map.put(i, getlistEnergy(week));
+ map.put(localDateTime.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")), getlistEnergy(week));
}
--
Gitblit v1.9.3