From 109af646c863e5c6a2ac2fa5eefdffa9fe86d252 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 20 四月 2022 14:19:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 83 ++++++++++++++++++++++++++++++++++-------
1 files changed, 68 insertions(+), 15 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 32cacdf..4be81cb 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,7 +1,6 @@
package com.sandu.ximon.admin.service;
import cn.hutool.core.collection.CollectionUtil;
-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;
@@ -9,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;
@@ -20,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;
@@ -31,7 +33,11 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-import java.util.*;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -196,26 +202,73 @@
*
* @return
*/
- public Map controlEnergySaving() {
+ public List<LightReportData> controlEnergySaving() {
Long clientId = SecurityUtils.getClientId();
- List<LightBo> listLight = baseMapper.listLight(clientId, null);
- List<String> deviceCodeList = listLight.stream().map(LightBo::getDeviceCode).collect(Collectors.toList());
+// List<LightBo> listLight = baseMapper.listLight(clientId, null);
+// List<String> deviceCodeList = listLight.stream().map(LightBo::getDeviceCode).collect(Collectors.toList());
- //鑾峰彇鐢ㄦ埛鏈�杩�7澶╃殑鍗曠伅鏁版嵁
- List<LightReportData> reportDataList = lightReportDataService.list(Wrappers.<LightReportData>lambdaQuery()
- .in(LightReportData::getDeviceCode, deviceCodeList)
- .ge(LightReportData::getCreateTime, DateUtil.offsetDay(new Date(), -7))
- .orderByDesc(LightReportData::getCreateTime));
+ List<LightTaskDto> lightTaskDtos = SpringContextHolder.getBean(LightTaskService.class).listLightTask(null, null);
+ LocalDateTime now = LocalDateTime.now();
+ lightTaskDtos.forEach(Task -> {
+ ControlLightCommandVO startTime = parseSwitchLightCommand(Task.getOpenOrder());
+ if(Task.getControlOrder()!=null){
+ List<ControlLightCommandVO> controlLightCommandVOS = parseControlLightCommand(Task.getControlOrder());
+ }
+ ControlLightCommandVO endTime = parseSwitchLightCommand(Task.getCloseOrder());
- if (CollectionUtil.isEmpty(reportDataList)) {
- throw new BusinessException("娌℃湁璺伅鏁版嵁");
+ });
+
+
+ return null;
+ }
+
+ /**
+ * 瑙ｆ瀽寮�鍏崇伅鎸囦护
+ */
+ 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);
}
- Map map = new HashMap();
- map.put("7", reportDataList);
+ return vo;
+ }
+ /**
+ * 瑙ｆ瀽鎺х伅鎸囦护
+ */
+ public List<ControlLightCommandVO> parseControlLightCommand(String command) {
+ char[] chars = command.toCharArray();
+ int i = chars.length / 7;
- return map;
+ 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 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