From 4f0c98099f43028d29546c7000ef48bc89282dc4 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 06 五月 2022 18:35:52 +0800
Subject: [PATCH] Changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 58aa5cf..e51607a 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
@@ -327,8 +327,7 @@
if (week < 1) {
week = 7;
}
- map.put(i, "鍛�" + week);
- map.put(i, getlist(week));
+ map.put(i, getlistEnergy(week));
}
@@ -546,7 +545,7 @@
ControlLightCommandVO startTime = parseSwitchLightCommand(Task.getOpenOrder());
ControlLightCommandVO endTime = parseSwitchLightCommand(Task.getCloseOrder());
//鑾峰彇鍒板崟鐏换鍔＄殑鑺傝兘鐜�
- if (Task.getControlOrder() != null) {//鏈夋帶绛夋寚浠� 鎷嗗垎璁＄畻
+ if (!Task.getControlOrder().isEmpty()) {//鏈夋帶绛夋寚浠� 鎷嗗垎璁＄畻
List<ControlLightCommandVO> controlLightCommandVOS = parseControlLightCommand(Task.getControlOrder());
@@ -571,6 +570,7 @@
}
} else {//鏃犳帶鐏寚浠� 鐩存帴璁＄畻
BigDecimal bigDecimal = calculateEnergySaving(startTime, endTime);
+ //璁＄畻鑳借��(閮ㄥ垎 鏃堕暱*浜害)
BigDecimal Energy = calculateEnergyConsumption(startTime, endTime);
//璁＄畻鑳借��(鎬� 鏃堕暱*浜害*鍔熺巼)
BigDecimal totalEnergy = totalEnergy(Energy, Task.getLightAdress(), poleTaskLightPowerBos);
@@ -661,7 +661,14 @@
//璁＄畻鑳借��(閮ㄥ垎 鏃堕暱*浜害)
public BigDecimal calculateEnergyConsumption(ControlLightCommandVO v1, ControlLightCommandVO v2) {
//璁＄畻鏃堕暱
- BigDecimal hour = BigDecimal.valueOf((v2.getHour() - v1.getHour()));
+ BigDecimal hour;
+ if (v2.getHour() > v1.getHour()){
+ hour = BigDecimal.valueOf((v2.getHour() - v1.getHour()));
+ }else if (v2.getHour() < v1.getHour()) {
+ hour = BigDecimal.valueOf((v2.getHour() + 24 - v1.getHour()));
+ } else {
+ hour = BigDecimal.valueOf(0);
+ }
BigDecimal min = BigDecimal.valueOf((v2.getMin() - v1.getMin()) / 60);
BigDecimal totalTime = (hour.add(min));
//璁＄畻浜伅鏃堕暱*浜害
--
Gitblit v1.9.3