From 6545018da75375faeeb00c227bbf0e0b487de574 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 20 五月 2022 16:41:48 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 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 e1942a8..2089bb7 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
@@ -30,6 +30,7 @@
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.TaskOrderUtil;
import com.sandu.ximon.dao.bo.LightTaskStatusAndPole;
+import com.sandu.ximon.dao.domain.LightEnergyData;
import com.sandu.ximon.dao.domain.LightTask;
import com.sandu.ximon.dao.domain.LightTaskPoleRelation;
import com.sandu.ximon.dao.domain.Pole;
@@ -63,6 +64,7 @@
private final LightTaskPoleRelationService lightTaskPoleRelationService;
private final LightTaskMapper lightTaskMapper;
private final ClientService clientService;
+ private final LightEnergyDataService lightEnergyDataService;
/**
* 鏂板璺伅浠诲姟
@@ -223,16 +225,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);
+ }
+
}
}
@@ -531,7 +538,7 @@
//璁＄畻鍔熺巼鍙婅兘鑰�
- public void test() {
+ public void energy() {
List<LightTask> lightTasks = list(Wrappers.lambdaQuery(LightTask.class));
for (LightTask lightTask : lightTasks) {
List<LightTaskPoleRelation> list = SpringContextHolder.getBean(LightTaskPoleRelationService.class)
@@ -541,9 +548,24 @@
BeanUtils.copyProperties(lightTask, lightTaskDto);
lightTaskDto.setWeekList(TaskOrderUtil.parseLightWeek2List(lightTask.getWeek()));
- BigDecimal decimal = SpringContextHolder.getBean(LightService.class).jisuan(lightTaskDto);
+ BigDecimal energySaving = SpringContextHolder.getBean(LightService.class).jisuan(lightTaskDto);
+ BigDecimal energy = SpringContextHolder.getBean(LightService.class).jisuanEnergy(lightTaskDto);
+ //鑾峰彇鏄ㄥぉ鐨勬槦鏈熸暟
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime yesterday = now.minusDays(1);
+
+ LightEnergyData lightEnergyData = new LightEnergyData();
+ lightEnergyData.setTaskId(lightTask.getTaskId());
+ lightEnergyData.setYtdTime(yesterday);
+ lightEnergyData.setEnergySaving(energySaving);
+ lightEnergyData.setEnergy(energy);
+ lightEnergyData.setUserId(lightTask.getUserId());
+ lightEnergyData.setClientId(lightTask.getClientId());
+
+ System.out.println(lightEnergyData + "---------------");
//ID 浠诲姟id
}
}
+
}
--
Gitblit v1.9.3