From c197ffe1a7b5ed3c94c95a95d86ce2ec201c8556 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期六, 07 五月 2022 10:49:57 +0800
Subject: [PATCH] Changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 65 ++++++++++++++++++++------------
1 files changed, 40 insertions(+), 25 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 e51607a..8d2f4d5 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
@@ -259,7 +259,6 @@
if (week < 1) {
week = 7;
}
- map.put(i, "鍛�" + week);
map.put(i, getlist(week));
}
@@ -479,7 +478,6 @@
*/
public BigDecimal jisuan(List<LightTaskDto> list) {
final BigDecimal[] bigDecimalResult = {new BigDecimal(0.00)};
- final BigDecimal[] bigEnergy = {new BigDecimal(0.00)};
/**
* 鑺傝兘鐜囪绠楀紑濮�
*/
@@ -489,35 +487,26 @@
ControlLightCommandVO endTime = parseSwitchLightCommand(Task.getCloseOrder());
//瀛樻斁鑺傝兘鐜�
//鑾峰彇鍒板崟鐏换鍔＄殑鑺傝兘鐜�
- if (Task.getControlOrder() != null) {//鏈夋帶绛夋寚浠� 鎷嗗垎璁＄畻
+ if (Task.getControlOrder() != null && !Task.getControlOrder().isEmpty()) {//鏈夋帶绛夋寚浠� 鎷嗗垎璁＄畻
List<ControlLightCommandVO> controlLightCommandVOS = parseControlLightCommand(Task.getControlOrder());
-
for (int i = 0; i < controlLightCommandVOS.size(); i++) {
BigDecimal bigDecimal = calculateEnergySaving(startTime, controlLightCommandVOS.get(i));
- BigDecimal bigEnergy1 = calculateEnergyConsumption(startTime, controlLightCommandVOS.get(i));
+ bigDecimalResult[0] = bigDecimalResult[0].add(bigDecimal);
if (controlLightCommandVOS.size() == (i + 1)) {
BigDecimal bigDecimal1 = calculateEnergySaving(controlLightCommandVOS.get(i), endTime);
- BigDecimal bigEnergy2 = calculateEnergyConsumption(controlLightCommandVOS.get(i), endTime);
-
System.out.println(bigDecimal1 + "===========================");
- System.out.println(bigEnergy + "鏃堕暱*浜害===========================");
// saving.add(bigDecimal1);
bigDecimalResult[0] = bigDecimalResult[0].add(bigDecimal1);
- bigEnergy[0] = bigEnergy[0].add(bigEnergy2);
break;
}
startTime = controlLightCommandVOS.get(i);
// saving.add(bigDecimal);
- bigDecimalResult[0] = bigDecimalResult[0].add(bigDecimal);
- bigEnergy[0] = bigEnergy[0].add(bigEnergy1);
}
} else {//鏃犳帶鐏寚浠� 鐩存帴璁＄畻
BigDecimal bigDecimal = calculateEnergySaving(startTime, endTime);
- BigDecimal Energy = calculateEnergyConsumption(startTime, endTime);
// saving.add(bigDecimal);
bigDecimalResult[0] = bigDecimalResult[0].add(bigDecimal);
- bigEnergy[0] = bigEnergy[0].add(Energy);
}
});
return bigDecimalResult[0];
@@ -552,24 +541,26 @@
for (int i = 0; i < controlLightCommandVOS.size(); i++) {
//寰楀埌鏃堕暱*浜害
BigDecimal bigEnergy1 = calculateEnergyConsumption(startTime, controlLightCommandVOS.get(i));
+// //璁＄畻鑳借��(鎬� 鏃堕暱*浜害*鍔熺巼)
+ BigDecimal totalEnergy = totalEnergy(bigEnergy1, Task.getLightAdress(), poleTaskLightPowerBos);
+ bigEnergy[0] = bigEnergy[0].add(totalEnergy);
+// BigDecimal totalEnergy4 = totalEnergy(bigEnergy1, Task.getLightAdress(), poleTaskLightPowerBos);
+// bigEnergy[0] = bigEnergy[0].add(totalEnergy4);
if (controlLightCommandVOS.size() == (i + 1)) {
BigDecimal bigEnergy2 = calculateEnergyConsumption(controlLightCommandVOS.get(i), endTime);
- System.out.println(bigEnergy + "鏃堕暱*浜害===========================");
+ System.out.println(bigEnergy2 + "鏃堕暱*浜害===========================");
//璁＄畻鑳借��(鎬� 鏃堕暱*浜害*鍔熺巼)
- BigDecimal totalEnergy = totalEnergy(bigEnergy2, Task.getLightAdress(), poleTaskLightPowerBos);
+ BigDecimal totalEnergy3 = totalEnergy(bigEnergy2, Task.getLightAdress(), poleTaskLightPowerBos);
// saving.add(bigDecimal1);
- bigEnergy[0] = bigEnergy[0].add(totalEnergy);
+ bigEnergy[0] = bigEnergy[0].add(totalEnergy3);
break;
}
startTime = controlLightCommandVOS.get(i);
//璁＄畻鑳借��(鎬� 鏃堕暱*浜害*鍔熺巼)
- BigDecimal totalEnergy = totalEnergy(bigEnergy1, Task.getLightAdress(), poleTaskLightPowerBos);
- bigEnergy[0] = bigEnergy[0].add(totalEnergy);
}
} else {//鏃犳帶鐏寚浠� 鐩存帴璁＄畻
- BigDecimal bigDecimal = calculateEnergySaving(startTime, endTime);
//璁＄畻鑳借��(閮ㄥ垎 鏃堕暱*浜害)
BigDecimal Energy = calculateEnergyConsumption(startTime, endTime);
//璁＄畻鑳借��(鎬� 鏃堕暱*浜害*鍔熺巼)
@@ -648,8 +639,25 @@
//璁＄畻鑺傝兘鐜�
public BigDecimal calculateEnergySaving(ControlLightCommandVO v1, ControlLightCommandVO v2) {
- BigDecimal hour = BigDecimal.valueOf((v2.getHour() - v1.getHour()));
- BigDecimal min = BigDecimal.valueOf((v2.getMin() - v1.getMin()) / 60);
+// 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 min;
+ if (v2.getMin() > v1.getMin()) {
+ min = BigDecimal.valueOf((v2.getMin() - v1.getMin()) / 60);
+ } else if (v2.getMin() < v1.getMin()) {
+ min = BigDecimal.valueOf((v2.getMin() + 60 - v1.getMin()) / 60);
+ } else {
+ min = BigDecimal.valueOf(0);
+ }
+
BigDecimal totalTime = (hour.add(min));
BigDecimal energySaving = BigDecimal.valueOf((100 - v1.getBrightness())).divide(BigDecimal.valueOf(100)).multiply(totalTime).divide(BigDecimal.valueOf(24), 2);
@@ -662,17 +670,24 @@
public BigDecimal calculateEnergyConsumption(ControlLightCommandVO v1, ControlLightCommandVO v2) {
//璁＄畻鏃堕暱
BigDecimal hour;
- if (v2.getHour() > v1.getHour()){
+ if (v2.getHour() > v1.getHour()) {
hour = BigDecimal.valueOf((v2.getHour() - v1.getHour()));
- }else if (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 min;
+ if (v2.getMin() > v1.getMin()) {
+ min = BigDecimal.valueOf((v2.getMin() - v1.getMin()) / 60);
+ } else if (v2.getMin() < v1.getMin()) {
+ min = BigDecimal.valueOf((v2.getMin() + 60 - v1.getMin()) / 60);
+ } else {
+ min = BigDecimal.valueOf(0);
+ }
BigDecimal totalTime = (hour.add(min));
//璁＄畻浜伅鏃堕暱*浜害
- BigDecimal energyConsumption = totalTime.multiply(BigDecimal.valueOf(v1.getBrightness()));
+ BigDecimal energyConsumption = totalTime.multiply(BigDecimal.valueOf(v1.getBrightness())).divide(BigDecimal.valueOf(100));
return energyConsumption;
}
--
Gitblit v1.9.3