From 35b68d05c92ae1eab2e409529a070a217ba492ae Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 25 四月 2022 09:53:23 +0800
Subject: [PATCH] fix 客户列表bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 261 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 234 insertions(+), 27 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 481e2fa..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
@@ -1,8 +1,6 @@
package com.sandu.ximon.admin.service;
import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.HexUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -10,6 +8,8 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.redis.RedisService;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.common.util.SpringContextHolder;
+import com.sandu.ximon.admin.dto.LightTaskDto;
import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5LightHeartbeatReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.A5LightBrightnessReqInnerFrame;
@@ -21,6 +21,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.vo.ControlLightCommandVO;
import com.sandu.ximon.dao.bo.LightBo;
import com.sandu.ximon.dao.domain.Light;
import com.sandu.ximon.dao.domain.LightReportData;
@@ -32,6 +33,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
@@ -201,45 +203,250 @@
*
* @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());
- List<String> deviceCodeList = new ArrayList<>();
- deviceCodeList.add("32313243305005ffa633ffff");
-// DateTime startDate = DateUtil.date();
-// DateTime endDate = DateUtil.offsetDay(startDate, 3);
-// if (CollectionUtil.isNotEmpty(deviceCodeList)) {
-//
-// List<LightReportDataBo> reportDataList = lightReportDataService.reportDataList(deviceCodeList, startDate, endDate);
-// }
- //鑾峰彇鐢ㄦ埛鏈�杩�7澶╃殑鍗曠伅鏁版嵁
- List<LightReportData> reportDataList = lightReportDataService.list(Wrappers.<LightReportData>lambdaQuery()
- .in(LightReportData::getDeviceCode, deviceCodeList)
- .ge(LightReportData::getCreateTime, DateUtil.offsetDay(DateUtil.yesterday(), -7))
- .orderByDesc(LightReportData::getCreateTime));
+ //鑾峰彇鍒版鍦ㄦ墽琛岀殑浠诲姟鍒楄〃
+ 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<>();
- LocalDateTime dateTime = LocalDateTime.now();
- dateTime.plusDays(7L);
- reportDataList.forEach(
- reportData -> {
- LocalDateTime createTime = reportData.getCreateTime();
- if(dateTime.plusDays(-1L).getDayOfMonth()==createTime.getDayOfMonth()){
-
- }
+ 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();
- map.put("-1", null);
- return reportDataList;
+ 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;
+ }
+
+ /**
+ * 涓�澶╃殑鑺傝兘鐜�
+ *
+ * @param list
+ * @return
+ */
+ public BigDecimal jisuan(List<LightTaskDto> list) {
+ final BigDecimal[] bigDecimalResult = {new BigDecimal(0.00)};
+ /**
+ * 鑺傝兘鐜囪绠楀紑濮�
+ */
+ list.forEach(Task -> {
+// List<BigDecimal> saving = new ArrayList<>();
+ 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 bigDecimal = calculateEnergySaving(startTime, controlLightCommandVOS.get(i));
+ if (controlLightCommandVOS.size() == (i + 1)) {
+ BigDecimal bigDecimal1 = calculateEnergySaving(controlLightCommandVOS.get(i), endTime);
+ System.out.println(bigDecimal1 + "===========================");
+// saving.add(bigDecimal1);
+ bigDecimalResult[0] = bigDecimalResult[0].add(bigDecimal1);
+ break;
+ }
+ startTime = controlLightCommandVOS.get(i);
+// saving.add(bigDecimal);
+ bigDecimalResult[0] = bigDecimalResult[0].add(bigDecimal);
+ }
+ } else {//鏃犳帶鐏寚浠� 鐩存帴璁＄畻
+ BigDecimal bigDecimal = calculateEnergySaving(startTime, endTime);
+// saving.add(bigDecimal);
+ bigDecimalResult[0] = bigDecimalResult[0].add(bigDecimal);
+ }
+ });
+ return bigDecimalResult[0];
+
+ /**
+ * 鑺傝兘鐜囪绠楃粨鏉�
+ */
+ }
+
+ /**
+ * 瑙ｆ瀽寮�鍏崇伅鎸囦护
+ */
+ public ControlLightCommandVO parseSwitchLightCommand(String command) {
+ char[] chars = command.toCharArray();
+ ControlLightCommandVO vo = new ControlLightCommandVO();
+ if (chars.length == 7) {
+ int hour = Integer.valueOf(command.substring(0, 2));
+ int min = Integer.valueOf(command.substring(2, 4));
+ int brightness = Integer.valueOf(command.substring(4, 7));
+ vo.setHour(hour);
+ vo.setMin(min);
+ vo.setBrightness(brightness);
+ }
+ return vo;
+ }
+
+ /**
+ * 瑙ｆ瀽鎺х伅鎸囦护
+ */
+ public List<ControlLightCommandVO> parseControlLightCommand(String command) {
+ char[] chars = command.toCharArray();
+ int i = chars.length / 7;
+
+ List<ControlLightCommandVO> list = new ArrayList<>();
+
+ for (int j = 0; j < i; j++) {
+ int hour = Integer.valueOf(command.substring(0 + (j * 7), 2 + (j * 7)));
+ int min = Integer.valueOf(command.substring(2 + (j * 7), 4 + (j * 7)));
+ int brightness = Integer.valueOf(command.substring(4 + (j * 7), 7 + (j * 7)));
+ ControlLightCommandVO vo = new ControlLightCommandVO();
+ vo.setHour(hour);
+ vo.setMin(min);
+ vo.setBrightness(brightness);
+ list.add(vo);
+ }
+ return list;
+ }
+
+ //璁＄畻鑺傝兘鐜�
+ 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 energySaving = BigDecimal.valueOf((100 - v1.getBrightness())).divide(BigDecimal.valueOf(100)).multiply(totalTime).divide(BigDecimal.valueOf(24), 2);
+ System.out.println(energySaving);
+ 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);
+// }
+
+
/**
* 鐢ㄦ埛鎷ユ湁鐨勮矾鐏�
*
--
Gitblit v1.9.3