From 8b579a8f3ce509efcc63ba65124e46f9375696be Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 16 五月 2022 16:03:47 +0800
Subject: [PATCH] 日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 54 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 36 insertions(+), 18 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 421e6fd..e9c8abd 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
@@ -23,6 +23,7 @@
import com.sandu.ximon.admin.param.LightRemarkParam;
import com.sandu.ximon.admin.redis.LightKey;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.vo.ControlLightCommandVO;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.bo.LightBo;
@@ -40,6 +41,8 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -202,7 +205,9 @@
Map<String, Object> map = new HashMap<>();
try {
map.put("deviceCode", param.getDeviceCode());
- WrapResponseCommonFrame<A5LightBrightnessRespInnerFrame> frame = MainBoardInvokeSyncService.getInstance().sendRRPC(param.getDeviceCode(), a5Frame, A5LightBrightnessRespInnerFrame.class);
+ WrapResponseCommonFrame<A5LightBrightnessRespInnerFrame> frame
+ = MainBoardInvokeSyncService.getInstance().sendRRPC(param.getDeviceCode(), a5Frame, A5LightBrightnessRespInnerFrame.class);
+ StoreOperationRecordsUtils.storeInnerFrameData(param.getDeviceCode(), "鍗曠伅甯�-浜害鎺у埗", a5Frame, frame);
if (frame == null) {
map.put("status", DeviceRespStatusEnums.OTHER_ERROR.getCode());
resultList.add(map);
@@ -277,9 +282,13 @@
}
}
- Integer week = now.getDayOfWeek().getValue();
+ //鑾峰彇褰撳墠鏄熸湡鍑� 1-7
+
+ int week = now.getDayOfWeek().getValue();
Map map = new HashMap();
+ //鑾峰彇鏃ユ湡 绮剧‘鍒板ぉ
+ LocalDateTime localDateTime = now.with(LocalTime.MIN);
for (int i = 1; i < 8; i++) {
@@ -287,7 +296,8 @@
if (week < 1) {
week = 7;
}
- map.put(i, getlist(week));
+ String format = localDateTime.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ map.put(localDateTime.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")), getlist(week));
}
@@ -347,6 +357,8 @@
Integer week = now.getDayOfWeek().getValue();
Map map = new HashMap();
+ //鑾峰彇褰撳墠鏃ユ湡 鏍煎紡涓簓yyy-MM-dd
+ LocalDateTime localDateTime = now.with(LocalTime.MIN);
for (int i = 1; i < 8; i++) {
@@ -354,7 +366,7 @@
if (week < 1) {
week = 7;
}
- map.put(i, getlistEnergy(week));
+ map.put(localDateTime.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")), getlistEnergy(week));
}
@@ -523,7 +535,7 @@
bigDecimalResult[0] = bigDecimalResult[0].add(bigDecimal);
if (controlLightCommandVOS.size() == (i + 1)) {
BigDecimal bigDecimal1 = calculateEnergySaving(controlLightCommandVOS.get(i), endTime);
- System.out.println(bigDecimal1 + "===========================");
+// System.out.println(bigDecimal1 + "===========================");
// saving.add(bigDecimal1);
bigDecimalResult[0] = bigDecimalResult[0].add(bigDecimal1);
break;
@@ -668,28 +680,33 @@
public BigDecimal calculateEnergySaving(ControlLightCommandVO v1, ControlLightCommandVO v2) {
// BigDecimal hour = BigDecimal.valueOf((v2.getHour() - v1.getHour()));
- BigDecimal hour;
+// BigDecimal hour;
+ double hour;
+ double min;
+ //璁＄畻鏃堕暱
if (v2.getHour() > v1.getHour()) {
- hour = BigDecimal.valueOf((v2.getHour() - v1.getHour()));
+ hour = v2.getHour() - v1.getHour();
} else if (v2.getHour() < v1.getHour()) {
- hour = BigDecimal.valueOf((v2.getHour() + 24 - v1.getHour()));
+ hour = 24 + (v2.getHour() - v1.getHour());
} else {
- hour = BigDecimal.valueOf(0);
+ hour = 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);
+ min = v2.getMin() - v1.getMin();
} else if (v2.getMin() < v1.getMin()) {
- min = BigDecimal.valueOf((v2.getMin() + 60 - v1.getMin()) / 60);
+ min = 60 + (v1.getMin() - v2.getMin());
+ hour = hour - 1;
} else {
- min = BigDecimal.valueOf(0);
+ min = 0;
}
+ //璁＄畻鏃堕暱
+ BigDecimal totalTime = BigDecimal.valueOf(hour * 60 + min);
- 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);
+ //璁＄畻鑺傝兘鐜� ( (1-v1.getBrightness()/100)*totalTime/3600 ) 淇濈暀涓や綅灏忔暟
+ BigDecimal energySaving = BigDecimal.valueOf((1 - v1.getBrightness() / 100) * totalTime.doubleValue() / 3600).setScale(2, BigDecimal.ROUND_HALF_UP);
+ System.out.println(energySaving + "鑺傝兘鐜�");
return energySaving;
}
@@ -710,6 +727,7 @@
min = BigDecimal.valueOf((v2.getMin() - v1.getMin()) / 60);
} else if (v2.getMin() < v1.getMin()) {
min = BigDecimal.valueOf((v2.getMin() + 60 - v1.getMin()) / 60);
+ hour = hour.subtract(BigDecimal.valueOf(1));
} else {
min = BigDecimal.valueOf(0);
}
--
Gitblit v1.9.3