From dc10259ff075d8b1760b9ff1c03af58a7cd13d66 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 22 四月 2022 11:01:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 108 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 92 insertions(+), 16 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 a87ceb4..58a4ddb 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
@@ -222,7 +222,7 @@
for (LightTaskDto lightTaskDto : lightTaskDtos) {
List<Integer> weekList = lightTaskDto.getWeekList();
- System.out.println(weekList+"===========================");
+ System.out.println(weekList + "===========================");
for (Integer one : weekList) {
switch (one) {
case 1:
@@ -250,17 +250,93 @@
}
}
}
+
+ Integer week = now.getDayOfWeek().getValue();
+
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));
+
+
+ for (int i = 1; i < 8; i++) {
+ week--;
+ if (week < 1) {
+ week = 7;
+ }
+ map.put(i, "鍛�" + week);
+// map.put(i, getlist(week));
+ }
return map;
+ }
+
+
+ public BigDecimal getlist(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 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;
}
/**
@@ -270,7 +346,7 @@
* @return
*/
public BigDecimal jisuan(List<LightTaskDto> list) {
- BigDecimal bigDecimalResult = new BigDecimal(0.00);
+ final BigDecimal[] bigDecimalResult = {new BigDecimal(0.00)};
/**
* 鑺傝兘鐜囪绠楀紑濮�
*/
@@ -286,24 +362,24 @@
for (int i = 0; i < controlLightCommandVOS.size(); i++) {
BigDecimal bigDecimal = calculateEnergySaving(startTime, controlLightCommandVOS.get(i));
- if (controlLightCommandVOS.size() == (i+1)) {
+ if (controlLightCommandVOS.size() == (i + 1)) {
BigDecimal bigDecimal1 = calculateEnergySaving(controlLightCommandVOS.get(i), endTime);
- System.out.println(bigDecimal1+"===========================");
+ System.out.println(bigDecimal1 + "===========================");
// saving.add(bigDecimal1);
- bigDecimalResult.add(bigDecimal1);
+ bigDecimalResult[0] = bigDecimalResult[0].add(bigDecimal1);
break;
}
startTime = controlLightCommandVOS.get(i);
// saving.add(bigDecimal);
- bigDecimalResult.add(bigDecimal);
+ bigDecimalResult[0] = bigDecimalResult[0].add(bigDecimal);
}
} else {//鏃犳帶鐏寚浠� 鐩存帴璁＄畻
BigDecimal bigDecimal = calculateEnergySaving(startTime, endTime);
// saving.add(bigDecimal);
- bigDecimalResult.add(bigDecimal);
+ bigDecimalResult[0] = bigDecimalResult[0].add(bigDecimal);
}
});
- return bigDecimalResult;
+ return bigDecimalResult[0];
/**
* 鑺傝兘鐜囪绠楃粨鏉�
@@ -356,7 +432,7 @@
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),2);
+ BigDecimal energySaving = BigDecimal.valueOf((100 - v1.getBrightness())).divide(BigDecimal.valueOf(100)).multiply(totalTime).divide(BigDecimal.valueOf(24), 2);
System.out.println(energySaving);
return energySaving;
}
--
Gitblit v1.9.3