From 562c82e54b9fc9ac9a640f07b9d03355226ae3f4 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 20 五月 2022 18:06:13 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
index 7f487a5..7b4aac2 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
@@ -44,6 +44,7 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -225,16 +226,21 @@
);
//淇敼鐏潌浠诲姟缁戝畾鍏崇郴琛�
for (LightTaskPoleRelation bean : lightTaskPoleRelationList) {
+ LightTaskPoleRelation one = lightTaskPoleRelationService.getOne(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, bean.getPoleId()));
+
//鎴愬姛鎵嶄慨鏀癸紝澶辫触涓嶅彉
if (bean.getIssueStatus() == 0) {
-
- LightTaskPoleRelation one = lightTaskPoleRelationService.getOne(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getPoleId, bean.getPoleId()));
if (one != null) {
one.setTaskId(newLightTask.getTaskId());
lightTaskPoleRelationService.updateById(one);
} else {
lightTaskPoleRelationService.save(bean);
}
+ } else {
+ if (one == null) {
+ lightTaskPoleRelationService.save(bean);
+ }
+
}
}
@@ -532,7 +538,9 @@
}
- //璁＄畻鍔熺巼鍙婅兘鑰�
+ /**
+ * 璁＄畻鍔熺巼鍙婅兘鑰�
+ */
public void energy() {
List<LightTask> lightTasks = list(Wrappers.lambdaQuery(LightTask.class));
for (LightTask lightTask : lightTasks) {
@@ -550,14 +558,18 @@
LocalDateTime now = LocalDateTime.now();
LocalDateTime yesterday = now.minusDays(1);
+
LightEnergyData lightEnergyData = new LightEnergyData();
lightEnergyData.setTaskId(lightTask.getTaskId());
- lightEnergyData.setYtdTime(yesterday);
+ lightEnergyData.setYtdTime(yesterday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
lightEnergyData.setEnergySaving(energySaving);
lightEnergyData.setEnergy(energy);
lightEnergyData.setUserId(lightTask.getUserId());
lightEnergyData.setClientId(lightTask.getClientId());
+ //淇濆瓨鑳借�楁暟鎹埌鏁版嵁搴�
+ lightEnergyDataService.save(lightEnergyData);
+
System.out.println(lightEnergyData + "---------------");
//ID 浠诲姟id
}
--
Gitblit v1.9.3