From ccac77fc264074c74cd1c9cf374f26aae45458db Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 21 四月 2022 09:48:10 +0800
Subject: [PATCH] 首页
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 92 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 80 insertions(+), 12 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 f149baf..ab96cf4 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
@@ -203,7 +203,7 @@
*
* @return
*/
- public List<LightReportData> controlEnergySaving() {
+ 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());
@@ -212,34 +212,102 @@
List<LightTaskDto> lightTaskDtos = SpringContextHolder.getBean(LightTaskService.class).listTask();
LocalDateTime now = LocalDateTime.now();
- lightTaskDtos.forEach(Task -> {
+ 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:
+ }
+ }
+ }
+ Map map = new HashMap();
+ map.put("1", jisuan(list1));
+ map.put("2", jisuan(list2));
+ map.put("3", jisuan(list3));
+ map.put("4", jisuan(list4));
+ map.put("5", jisuan(list5));
+ map.put("6", jisuan(list6));
+ map.put("7", jisuan(list7));
+
+
+ return map;
+ }
+
+ /**
+ * 涓�澶╃殑鑺傝兘鐜�
+ *
+ * @param list
+ * @return
+ */
+ public BigDecimal jisuan(List<LightTaskDto> list) {
+ BigDecimal bigDecimalResult = new BigDecimal(0.00);
+ /**
+ * 鑺傝兘鐜囪绠楀紑濮�
+ */
+ list.forEach(Task -> {
+// List<BigDecimal> saving = new ArrayList<>();
ControlLightCommandVO startTime = parseSwitchLightCommand(Task.getOpenOrder());
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){
+ if (controlLightCommandVOS.size() == (i+1)) {
BigDecimal bigDecimal1 = calculateEnergySaving(controlLightCommandVOS.get(i), endTime);
- saving.add(bigDecimal1);
+ System.out.println(bigDecimal1+"===========================");
+// saving.add(bigDecimal1);
+ bigDecimalResult.add(bigDecimal1);
break;
}
startTime = controlLightCommandVOS.get(i);
- saving.add(bigDecimal);
+// saving.add(bigDecimal);
+ bigDecimalResult.add(bigDecimal);
}
- }else {//鏃犳帶鐏寚浠� 鐩存帴璁＄畻
+ } else {//鏃犳帶鐏寚浠� 鐩存帴璁＄畻
BigDecimal bigDecimal = calculateEnergySaving(startTime, endTime);
- saving.add(bigDecimal);
+// saving.add(bigDecimal);
+ bigDecimalResult.add(bigDecimal);
}
-
-
});
+ return bigDecimalResult;
-
- return null;
+ /**
+ * 鑺傝兘鐜囪绠楃粨鏉�
+ */
}
/**
--
Gitblit v1.9.3