From 1191ee2f17238364542ec93f53a201abadc619dc Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 05 五月 2022 18:22:40 +0800
Subject: [PATCH] Changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 284 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 252 insertions(+), 32 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 51e2048..58aa5cf 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
@@ -25,12 +25,14 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.vo.ControlLightCommandVO;
import com.sandu.ximon.dao.bo.LightBo;
+import com.sandu.ximon.dao.bo.PoleTaskLightPowerBo;
import com.sandu.ximon.dao.domain.Light;
import com.sandu.ximon.dao.domain.LightReportData;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.enums.DeviceRespStatusEnums;
import com.sandu.ximon.dao.mapper.LightMapper;
+import com.sandu.ximon.dao.mapper.LightTaskMapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -106,16 +108,15 @@
List<LightReportData> reportDataList = lightReportDataService.getNewestReportByDeviceCode(deviceCodeList);
for (LightBo lightBo : listLight) {
deviceCodeList.forEach(code -> {
- PoleBinding bind = bindingService.getPoleIdByMac(code);
- if (bind != null && lightBo.getDeviceCode().equals(bind.getDeviceCode())) {
- Long poleId = bind.getPoleId();
- Pole pole = poleService.getById(poleId);
- lightBo.setPoleId(pole.getId());
- lightBo.setPoleCode(pole.getDeviceCode());
- lightBo.setPoleName(pole.getPoleName());
- }
- }
- );
+ PoleBinding bind = bindingService.getPoleIdByMac(code);
+ if (bind != null && lightBo.getDeviceCode().equals(bind.getDeviceCode())) {
+ Long poleId = bind.getPoleId();
+ Pole pole = poleService.getById(poleId);
+ lightBo.setPoleId(pole.getId());
+ lightBo.setPoleCode(pole.getDeviceCode());
+ lightBo.setPoleName(pole.getPoleName());
+ }
+ });
for (LightReportData lightReportData : reportDataList) {
if (StrUtil.equals(lightBo.getDeviceCode(), lightReportData.getDeviceCode())) {
lightBo.setReportTime(lightReportData.getCreateTime1());
@@ -173,8 +174,7 @@
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);
if (frame == null) {
map.put("status", DeviceRespStatusEnums.OTHER_ERROR.getCode());
resultList.add(map);
@@ -206,10 +206,6 @@
* @return
*/
public Map controlEnergySaving() {
- Long clientId = SecurityUtils.getClientId();
-// 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).listTask();
LocalDateTime now = LocalDateTime.now();
@@ -264,7 +260,75 @@
week = 7;
}
map.put(i, "鍛�" + week);
-// map.put(i, getlist(week));
+ map.put(i, getlist(week));
+ }
+
+
+ return map;
+ }
+
+
+ /**
+ * 鍗曠伅鑳借��
+ *
+ * @return
+ */
+ public Map controlEnergy() {
+ //鑾峰彇鍒版鍦ㄦ墽琛岀殑浠诲姟鍒楄〃
+ List<LightTaskDto> lightTaskDtos = SpringContextHolder.getBean(LightTaskService.class).listTask();
+ LocalDateTime now = LocalDateTime.now();
+
+ List<LightTaskDto> list1 = new ArrayList<>();
+ List<LightTaskDto> list2 = new ArrayList<>();
+ List<LightTaskDto> list3 = new ArrayList<>();
+ List<LightTaskDto> list4 = new ArrayList<>();
+ List<LightTaskDto> list5 = new ArrayList<>();
+ List<LightTaskDto> list6 = new ArrayList<>();
+ List<LightTaskDto> list7 = new ArrayList<>();
+
+ for (LightTaskDto lightTaskDto : lightTaskDtos) {
+ List<Integer> weekList = lightTaskDto.getWeekList();
+ System.out.println(weekList + "===========================");
+ for (Integer one : weekList) {
+ switch (one) {
+ case 1:
+ list1.add(lightTaskDto);
+ break;
+ case 2:
+ list2.add(lightTaskDto);
+ break;
+ case 4:
+ list3.add(lightTaskDto);
+ break;
+ case 8:
+ list4.add(lightTaskDto);
+ break;
+ case 16:
+ list5.add(lightTaskDto);
+ break;
+ case 32:
+ list6.add(lightTaskDto);
+ break;
+ case 64:
+ list7.add(lightTaskDto);
+ break;
+ default:
+ }
+ }
+ }
+
+ Integer week = now.getDayOfWeek().getValue();
+
+ Map map = new HashMap();
+
+
+ for (int i = 1; i < 8; i++) {
+ week--;
+ if (week < 1) {
+ week = 7;
+ }
+ map.put(i, "鍛�" + week);
+ map.put(i, getlist(week));
}
@@ -324,18 +388,85 @@
return jisuan(list1);
} else if (week == 2) {
return jisuan(list2);
-
} else if (week == 3) {
return jisuan(list3);
} else if (week == 4) {
return jisuan(list4);
} else if (week == 5) {
return jisuan(list5);
-
} else if (week == 6) {
return jisuan(list6);
} else if (week == 7) {
return jisuan(list7);
+ }
+
+ return null;
+ }
+
+
+ public BigDecimal getlistEnergy(Integer week) {
+
+ Long clientId = SecurityUtils.getClientId();
+// 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).listTask();
+
+ LocalDateTime now = LocalDateTime.now();
+
+ List<LightTaskDto> list1 = new ArrayList<>();
+ List<LightTaskDto> list2 = new ArrayList<>();
+ List<LightTaskDto> list3 = new ArrayList<>();
+ List<LightTaskDto> list4 = new ArrayList<>();
+ List<LightTaskDto> list5 = new ArrayList<>();
+ List<LightTaskDto> list6 = new ArrayList<>();
+ List<LightTaskDto> list7 = new ArrayList<>();
+
+ for (LightTaskDto lightTaskDto : lightTaskDtos) {
+ List<Integer> weekList = lightTaskDto.getWeekList();
+ System.out.println(weekList + "===========================");
+ for (Integer one : weekList) {
+ switch (one) {
+ case 1:
+ list1.add(lightTaskDto);
+ break;
+ case 2:
+ list2.add(lightTaskDto);
+ break;
+ case 4:
+ list3.add(lightTaskDto);
+ break;
+ case 8:
+ list4.add(lightTaskDto);
+ break;
+ case 16:
+ list5.add(lightTaskDto);
+ break;
+ case 32:
+ list6.add(lightTaskDto);
+ break;
+ case 64:
+ list7.add(lightTaskDto);
+ break;
+ default:
+ }
+ }
+ }
+ if (week == 1) {
+ return jisuanEnergy(list1);
+ } else if (week == 2) {
+ return jisuanEnergy(list2);
+ } else if (week == 3) {
+ return jisuanEnergy(list3);
+ } else if (week == 4) {
+ return jisuanEnergy(list4);
+ } else if (week == 5) {
+ return jisuanEnergy(list5);
+ } else if (week == 6) {
+ return jisuanEnergy(list6);
+ } else if (week == 7) {
+ return jisuanEnergy(list7);
}
return null;
@@ -349,6 +480,7 @@
*/
public BigDecimal jisuan(List<LightTaskDto> list) {
final BigDecimal[] bigDecimalResult = {new BigDecimal(0.00)};
+ final BigDecimal[] bigEnergy = {new BigDecimal(0.00)};
/**
* 鑺傝兘鐜囪绠楀紑濮�
*/
@@ -364,21 +496,29 @@
for (int i = 0; i < controlLightCommandVOS.size(); i++) {
BigDecimal bigDecimal = calculateEnergySaving(startTime, controlLightCommandVOS.get(i));
+ BigDecimal bigEnergy1 = calculateEnergyConsumption(startTime, controlLightCommandVOS.get(i));
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];
@@ -386,6 +526,84 @@
/**
* 鑺傝兘鐜囪绠楃粨鏉�
*/
+ }
+
+
+ /**
+ * 涓�澶╃殑鑳借��
+ *
+ * @param list
+ * @return
+ */
+ public BigDecimal jisuanEnergy(List<LightTaskDto> list) {
+ //瀛樻斁鑳借��
+ final BigDecimal[] bigEnergy = {new BigDecimal(0.00)};
+ /**
+ * 鑺傝兘鐜囪绠楀紑濮�
+ */
+ list.forEach(Task -> {
+ List<PoleTaskLightPowerBo> poleTaskLightPowerBos = SpringContextHolder.getBean(LightTaskMapper.class).listLightTaskByTaskId(Task.getTaskId());
+ ControlLightCommandVO startTime = parseSwitchLightCommand(Task.getOpenOrder());
+ ControlLightCommandVO endTime = parseSwitchLightCommand(Task.getCloseOrder());
+ //鑾峰彇鍒板崟鐏换鍔＄殑鑺傝兘鐜�
+ if (Task.getControlOrder() != null) {//鏈夋帶绛夋寚浠� 鎷嗗垎璁＄畻
+ List<ControlLightCommandVO> controlLightCommandVOS = parseControlLightCommand(Task.getControlOrder());
+
+
+ for (int i = 0; i < controlLightCommandVOS.size(); i++) {
+ //寰楀埌鏃堕暱*浜害
+ BigDecimal bigEnergy1 = calculateEnergyConsumption(startTime, controlLightCommandVOS.get(i));
+ if (controlLightCommandVOS.size() == (i + 1)) {
+ BigDecimal bigEnergy2 = calculateEnergyConsumption(controlLightCommandVOS.get(i), endTime);
+
+ System.out.println(bigEnergy + "鏃堕暱*浜害===========================");
+
+ //璁＄畻鑳借��(鎬� 鏃堕暱*浜害*鍔熺巼)
+ BigDecimal totalEnergy = totalEnergy(bigEnergy2, Task.getLightAdress(), poleTaskLightPowerBos);
+// saving.add(bigDecimal1);
+ bigEnergy[0] = bigEnergy[0].add(totalEnergy);
+ 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);
+ //璁＄畻鑳借��(鎬� 鏃堕暱*浜害*鍔熺巼)
+ BigDecimal totalEnergy = totalEnergy(Energy, Task.getLightAdress(), poleTaskLightPowerBos);
+// saving.add(bigDecimal);
+ bigEnergy[0] = bigEnergy[0].add(totalEnergy);
+ }
+ });
+ return bigEnergy[0];
+
+ /**
+ * 璁＄畻鑳借�楃粨鏉�
+ */
+ }
+
+ private BigDecimal totalEnergy(BigDecimal bigEnergy2, String lightAdress, List<PoleTaskLightPowerBo> poleTaskLightPowerBos) {
+
+ //poleTaskLightPowerBos 鍖呭惈璇ヤ换鍔℃墍鏈夌殑鐏殑鍔熺巼
+ //璁＄畻鍔熺巼涔嬪拰
+ BigDecimal totalPower = new BigDecimal(0.00);
+ if ("FFFF".equals(lightAdress)) {
+ int totalPower1 = poleTaskLightPowerBos.stream().mapToInt(PoleTaskLightPowerBo::getPower1).sum();
+ int totalPower2 = poleTaskLightPowerBos.stream().mapToInt(PoleTaskLightPowerBo::getPower2).sum();
+ totalPower = new BigDecimal(totalPower1 + totalPower2);
+ } else if ("0001".equals(lightAdress)) {
+ int totalPower1 = poleTaskLightPowerBos.stream().mapToInt(PoleTaskLightPowerBo::getPower1).sum();
+ totalPower = new BigDecimal(totalPower1);
+ } else if ("0002".equals(lightAdress)) {
+ int totalPower2 = poleTaskLightPowerBos.stream().mapToInt(PoleTaskLightPowerBo::getPower2).sum();
+ totalPower = new BigDecimal(totalPower2);
+ } else {
+ return null;
+ }
+ return totalPower.multiply(bigEnergy2);
}
/**
@@ -439,14 +657,17 @@
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);
-// }
+
+ //璁＄畻鑳借��(閮ㄥ垎 鏃堕暱*浜害)
+ public BigDecimal calculateEnergyConsumption(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 energyConsumption = totalTime.multiply(BigDecimal.valueOf(v1.getBrightness()));
+ return energyConsumption;
+ }
/**
@@ -492,11 +713,10 @@
}
List<Light> lights = listByIds(lightPowerSettingParam.getLightIds());
lights.forEach(light -> {
- light.setPower1(lightPowerSettingParam.getPower1());
- light.setPower2(lightPowerSettingParam.getPower2());
- light.setLightCount(lightPowerSettingParam.getLightCount());
- }
- );
+ light.setPower1(lightPowerSettingParam.getPower1());
+ light.setPower2(lightPowerSettingParam.getPower2());
+ light.setLightCount(lightPowerSettingParam.getLightCount());
+ });
return updateBatchById(lights);
}
}
--
Gitblit v1.9.3