From 831b0b323c21ab574db318e5195bef29f150a30a Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 20 四月 2022 15:47:00 +0800
Subject: [PATCH] 首页
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 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 4be81cb..f149baf 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
@@ -33,6 +33,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
@@ -207,14 +208,32 @@
// List<LightBo> listLight = baseMapper.listLight(clientId, null);
// List<String> deviceCodeList = listLight.stream().map(LightBo::getDeviceCode).collect(Collectors.toList());
- List<LightTaskDto> lightTaskDtos = SpringContextHolder.getBean(LightTaskService.class).listLightTask(null, null);
+ //鑾峰彇鍒版鍦ㄦ墽琛岀殑浠诲姟鍒楄〃
+ List<LightTaskDto> lightTaskDtos = SpringContextHolder.getBean(LightTaskService.class).listTask();
LocalDateTime now = LocalDateTime.now();
+
lightTaskDtos.forEach(Task -> {
ControlLightCommandVO startTime = parseSwitchLightCommand(Task.getOpenOrder());
- if(Task.getControlOrder()!=null){
- List<ControlLightCommandVO> controlLightCommandVOS = parseControlLightCommand(Task.getControlOrder());
- }
ControlLightCommandVO endTime = parseSwitchLightCommand(Task.getCloseOrder());
+ //瀛樻斁鑺傝兘鐜�
+ List<BigDecimal> saving = new ArrayList<>();
+ //鑾峰彇鍒板崟鐏换鍔＄殑鑺傝兘鐜�
+ if (Task.getControlOrder() != null) {//鏈夋帶绛夋寚浠� 鎷嗗垎璁＄畻
+ List<ControlLightCommandVO> controlLightCommandVOS = parseControlLightCommand(Task.getControlOrder());
+ for (int i = 0; i < controlLightCommandVOS.size(); i++) {
+ BigDecimal bigDecimal = calculateEnergySaving(startTime, controlLightCommandVOS.get(i));
+ if(controlLightCommandVOS.size()==i){
+ BigDecimal bigDecimal1 = calculateEnergySaving(controlLightCommandVOS.get(i), endTime);
+ saving.add(bigDecimal1);
+ break;
+ }
+ startTime = controlLightCommandVOS.get(i);
+ saving.add(bigDecimal);
+ }
+ }else {//鏃犳帶鐏寚浠� 鐩存帴璁＄畻
+ BigDecimal bigDecimal = calculateEnergySaving(startTime, endTime);
+ saving.add(bigDecimal);
+ }
});
@@ -263,14 +282,27 @@
}
//璁＄畻鑺傝兘鐜�
- public void calculateEnergySaving(ControlLightCommandVO v1,ControlLightCommandVO v2){
- int hour = v2.getHour()- v1.getHour();
- int min = (v2.getMin()- v1.getMin());
- int brightness = v2.getBrightness()- v1.getBrightness();
- int totalTime=(hour*60+min)*60;
- Double energySaving = (1-(v1.getBrightness()/100.0))*totalTime/(36*24);
+ 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 totalTime = (hour.add(min));
+
+ BigDecimal energySaving = BigDecimal.valueOf((100 - v1.getBrightness())).divide(BigDecimal.valueOf(100)).multiply(totalTime).divide(BigDecimal.valueOf(24));
+ System.out.println(energySaving);
+ return energySaving;
}
+// //璁＄畻鑺傝兘鐜�
+// public void calculateEnergySaving(ControlLightCommandVO v1,ControlLightCommandVO v2){
+// int hour = v2.getHour()- v1.getHour();
+// int min = (v2.getMin()- v1.getMin());
+// int brightness = v2.getBrightness()- v1.getBrightness();
+// int totalTime=(hour*60+min)*60;
+// Double energySaving = (1-(v1.getBrightness()/100.0))*totalTime/(36*24);
+// }
+
+
/**
* 鐢ㄦ埛鎷ユ湁鐨勮矾鐏�
*
--
Gitblit v1.9.3