From a53950ffd0c8194e473d1357d633331eab376a64 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 01 六月 2022 10:00:24 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightEnergyDataService.java | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightEnergyDataService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightEnergyDataService.java
index 1e16d26..c25d62d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightEnergyDataService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightEnergyDataService.java
@@ -27,31 +27,23 @@
@AllArgsConstructor
public class LightEnergyDataService extends BaseServiceImpl<LightEnergyDataMapper, LightEnergyData> {
+ private final LightEnergyDataMapper lightEnergyDataMapper;
public List energy(int flag) {
Long userId = null;
if (SecurityUtils.getClientId() != null) {
userId = SecurityUtils.getUserId();
}
- LambdaQueryWrapper<LightEnergyData> lightEnergyDataLambdaQueryWrapper = Wrappers.lambdaQuery(LightEnergyData.class);
- if (userId != null) {
- Long finalUserId = userId;
- lightEnergyDataLambdaQueryWrapper.eq(LightEnergyData::getUserId, finalUserId).or(w -> {
- w.eq(LightEnergyData::getClientId, finalUserId);
- });
- }
+ LambdaQueryWrapper<LightEnergyData> lightEnergyDataLambdaQueryWrapper = new LambdaQueryWrapper<>();
+
LocalDateTime now = LocalDateTime.now();
List<Map> listResult = new ArrayList<>();
for (int i = 1; i < 8; i++) {
-
String format = now.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-
-
- lightEnergyDataLambdaQueryWrapper.eq(LightEnergyData::getYtdTime, format);
- List<LightEnergyData> list = list(lightEnergyDataLambdaQueryWrapper);
-
+ //鑾峰彇璇ュぉ鐢ㄦ埛鐨勮兘鑰�/鑺傝兘鐜囦换鍔ist
+ List<LightEnergyData> list = lightEnergyDataMapper.getEnergyList(userId, format);
BigDecimal[] energyAll = {new BigDecimal(0.00)};
BigDecimal[] energySavingAll = {new BigDecimal(0.00)};
list.forEach(
--
Gitblit v1.9.3