From 03267d87fade82578087123a1be515b6fde20bfb Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 17 五月 2022 14:19:01 +0800
Subject: [PATCH] 日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 181 ++++++++++++++++++++++++++++++++-------------
1 files changed, 129 insertions(+), 52 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..205a1c2 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,7 +23,9 @@
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;
import com.sandu.ximon.dao.bo.PoleTaskLightPowerBo;
import com.sandu.ximon.dao.domain.Light;
@@ -39,10 +41,9 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -146,6 +147,33 @@
return one;
}
+ /**
+ * 棣栭〉鐏潌缁戝畾淇℃伅
+ *
+ * @param deviceCode
+ * @return
+ */
+ public EquipmentInfomation getLightInfo(String deviceCode) {
+ EquipmentInfomation equipmentInfo = new EquipmentInfomation();
+ equipmentInfo.setEquipmentType("鍗曠伅");
+ if (deviceCode == null || deviceCode.trim().length() == 0) {
+ return equipmentInfo;
+ }
+ Light one = getOne(Wrappers.<Light>lambdaQuery().eq(Light::getDeviceCode, deviceCode));
+ if (one != null) {
+ equipmentInfo.setEquipmentMac(one.getDeviceCode());
+ equipmentInfo.setEquipmentCreateTime(one.getCreateTime());
+ }
+
+ Object o = redisService.get(LightKey.REPORT_MAC.key(deviceCode));
+ if (o != null) {
+ equipmentInfo.setEquipmentState("鍦ㄧ嚎");
+ } else {
+ equipmentInfo.setEquipmentState("绂荤嚎");
+ }
+ return equipmentInfo;
+ }
+
public boolean addRemark(LightRemarkParam param) {
Light light = getById(param.getLightId());
if (light == null) {
@@ -174,7 +202,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);
@@ -197,6 +227,20 @@
}
}
+ /**
+ * 鏈嶅姟绔壒閲忔帶鐏棩蹇楄褰曞紑濮�
+ */
+ String content = "{鎺х伅璇锋眰锛�" + paramList.toString()
+ + "锛� 鎺х伅缁撴灉锛�" + resultList.toString() + "}";
+ List<String> codeList = new ArrayList<>();
+ for (LightControlParam bean : paramList) {
+ codeList.add(bean.getDeviceCode());
+ }
+ StoreOperationRecordsUtils.storeOperationData(codeList, null, "鏈嶅姟绔壒閲忔帶鐏�", content);
+ /**
+ * 鏈嶅姟绔壒閲忔帶鐏棩蹇楄褰曠粨鏉�
+ */
+
return resultList;
}
@@ -205,7 +249,7 @@
*
* @return
*/
- public Map controlEnergySaving() {
+ public List controlEnergySaving() {
//鑾峰彇鍒版鍦ㄦ墽琛岀殑浠诲姟鍒楄〃
List<LightTaskDto> lightTaskDtos = SpringContextHolder.getBean(LightTaskService.class).listTask();
LocalDateTime now = LocalDateTime.now();
@@ -220,7 +264,6 @@
for (LightTaskDto lightTaskDto : lightTaskDtos) {
List<Integer> weekList = lightTaskDto.getWeekList();
- System.out.println(weekList + "===========================");
for (Integer one : weekList) {
switch (one) {
case 1:
@@ -249,22 +292,29 @@
}
}
- Integer week = now.getDayOfWeek().getValue();
- Map map = new HashMap();
+ //鑾峰彇褰撳墠鏄熸湡鍑� 1-7
+
+ int currentWeekValue = now.getDayOfWeek().getValue();
+ Map map;
+ List<Map> temp = new ArrayList<>();
+ //鑾峰彇鏃ユ湡 绮剧‘鍒板ぉ
+ LocalDateTime localDateTime = now.with(LocalTime.MIN);
for (int i = 1; i < 8; i++) {
- week--;
- if (week < 1) {
- week = 7;
+ currentWeekValue--;
+ if (currentWeekValue < 1) {
+ currentWeekValue = 7;
}
- map.put(i, "鍛�" + week);
- map.put(i, getlist(week));
+ map = new LinkedHashMap();
+ map.put("time",localDateTime.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ map.put("value", getlist(currentWeekValue));
+ temp.add(map);
}
- return map;
+ return temp;
}
@@ -273,7 +323,7 @@
*
* @return
*/
- public Map controlEnergy() {
+ public List controlEnergy() {
//鑾峰彇鍒版鍦ㄦ墽琛岀殑浠诲姟鍒楄〃
List<LightTaskDto> lightTaskDtos = SpringContextHolder.getBean(LightTaskService.class).listTask();
LocalDateTime now = LocalDateTime.now();
@@ -317,21 +367,26 @@
}
}
- Integer week = now.getDayOfWeek().getValue();
-
- Map map = new HashMap();
+ Integer currentWeekValue = now.getDayOfWeek().getValue();
+ Map map;
+ List<Map> temp = new ArrayList<>();
+ //鑾峰彇褰撳墠鏃ユ湡 鏍煎紡涓簓yyy-MM-dd
+ LocalDateTime localDateTime = now.with(LocalTime.MIN);
for (int i = 1; i < 8; i++) {
- week--;
- if (week < 1) {
- week = 7;
+ currentWeekValue--;
+ if (currentWeekValue < 1) {
+ currentWeekValue = 7;
}
- map.put(i, getlistEnergy(week));
+ map = new LinkedHashMap();
+ map.put("time",localDateTime.minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ map.put("value", getlistEnergy(currentWeekValue));
+ temp.add(map);
}
- return map;
+ return temp;
}
@@ -479,7 +534,6 @@
*/
public BigDecimal jisuan(List<LightTaskDto> list) {
final BigDecimal[] bigDecimalResult = {new BigDecimal(0.00)};
- final BigDecimal[] bigEnergy = {new BigDecimal(0.00)};
/**
* 鑺傝兘鐜囪绠楀紑濮�
*/
@@ -489,35 +543,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 + "鏃堕暱*浜害===========================");
+// System.out.println(bigDecimal1 + "===========================");
// 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 +597,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,12 +695,34 @@
//璁＄畻鑺傝兘鐜�
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 hour = BigDecimal.valueOf((v2.getHour() - v1.getHour()));
+// BigDecimal hour;
+ double hour;
+ double min;
+ //璁＄畻鏃堕暱
+ if (v2.getHour() > v1.getHour()) {
+ hour = v2.getHour() - v1.getHour();
+ } else if (v2.getHour() < v1.getHour()) {
+ hour = 24 + (v2.getHour() - v1.getHour());
+ } else {
+ hour = 0;
+ }
+ //璁＄畻鍒嗛挓
- BigDecimal energySaving = BigDecimal.valueOf((100 - v1.getBrightness())).divide(BigDecimal.valueOf(100)).multiply(totalTime).divide(BigDecimal.valueOf(24), 2);
- System.out.println(energySaving);
+ if (v2.getMin() > v1.getMin()) {
+ min = v2.getMin() - v1.getMin();
+ } else if (v2.getMin() < v1.getMin()) {
+ min = 60 + (v1.getMin() - v2.getMin());
+ hour = hour - 1;
+ } else {
+ min = 0;
+ }
+ //璁＄畻鏃堕暱
+ BigDecimal totalTime = BigDecimal.valueOf(hour * 60 + min);
+
+ //璁＄畻鑺傝兘鐜� ( (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;
}
@@ -662,17 +731,25 @@
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);
+ hour = hour.subtract(BigDecimal.valueOf(1));
+ } 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