From bfce748e37a753c729e15dd233600379f504d019 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 28 四月 2022 13:59:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 423 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 399 insertions(+), 24 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 eb80cab..f47039a 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
@@ -5,11 +5,14 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
+import com.sandu.common.domain.CommonPage;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.redis.RedisService;
import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.ximon.admin.dto.LightDataDto;
+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;
import com.sandu.ximon.admin.manager.iot.frame.inner.response.A5LightBrightnessRespInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.WrapResponseCommonFrame;
@@ -19,15 +22,24 @@
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;
+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 lombok.AllArgsConstructor;
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;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -42,23 +54,36 @@
private final RedisService redisService;
private final LightReportDataService lightReportDataService;
+ private final PoleBindingService bindingService;
+ private final PoleService poleService;
/**
* 褰曞叆褰撳墠璁惧鐮佺殑璺伅鏁版嵁
- * @param deviceName mac
+ *
+ * @param deviceName mac
+ * @param heartBeatDataPackage 蹇冭烦鏁版嵁
*/
- public void saveLight(String deviceName) {
+ public void saveLight(String deviceName, A5LightHeartbeatReportInnerFrame.HeartBeatDataPackage heartBeatDataPackage) {
Boolean hasKey = redisService.hasKey(LightKey.REPORT_MAC.key(deviceName));
- if(!hasKey){
+ if (!hasKey) {
int count = count(Wrappers.lambdaQuery(Light.class).eq(Light::getDeviceCode, deviceName));
- log.info("redis鏌ヤ笉鍒拌矾鐏暟鎹畕}={}",count,deviceName);
+ log.info("redis鏌ヤ笉鍒拌矾鐏暟鎹畕}={}", count, deviceName);
// 褰撳墠璺伅琛ㄦ病鏈夊綍鍏ヨ澶囧悧
- if(count == 0){
+ if (count == 0) {
Light light = new Light();
light.setDeviceCode(deviceName);
+ light.setLightPercent(heartBeatDataPackage.getLightPercent());
+ light.setLight2Percent(heartBeatDataPackage.getLight2Percent());
save(light);
}
- redisService.set(LightKey.REPORT_MAC.key(deviceName),1,LightKey.REPORT_MAC.expireSeconds());
+ redisService.set(LightKey.REPORT_MAC.key(deviceName), 1, LightKey.REPORT_MAC.expireSeconds());
+ log.info("鏂板璺伅");
+ } else {
+ Light light = new Light();
+ light.setLightPercent(heartBeatDataPackage.getLightPercent());
+ light.setLight2Percent(heartBeatDataPackage.getLight2Percent());
+ update(light, Wrappers.lambdaUpdate(Light.class).eq(Light::getDeviceCode, deviceName));
+ log.info("鏇存柊璺伅浜害");
}
}
@@ -72,16 +97,27 @@
PageHelper.startPage(pageNo, pageSize);
- List<LightBo> listLight = baseMapper.listLight(clientId,keyword);
+ List<LightBo> listLight = baseMapper.listLight(clientId, keyword);
// 鑾峰彇鏈�杩戠殑涓婃姤鏃堕棿
List<String> deviceCodeList = listLight.stream().map(Light::getDeviceCode).collect(Collectors.toList());
- if(CollectionUtil.isNotEmpty(deviceCodeList)){
- List<LightReportData> reportDataList = lightReportDataService.getNewestReportByDeviceCode(deviceCodeList);
+ if (CollectionUtil.isNotEmpty(deviceCodeList)) {
+ 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());
+ }
+ }
+ );
for (LightReportData lightReportData : reportDataList) {
- if(StrUtil.equals(lightBo.getDeviceCode(),lightReportData.getDeviceCode())){
- lightBo.setReportTime(lightReportData.getCreateTime());
+ if (StrUtil.equals(lightBo.getDeviceCode(), lightReportData.getDeviceCode())) {
+ lightBo.setReportTime(lightReportData.getCreateTime1());
break;
}
}
@@ -91,9 +127,26 @@
return listLight;
}
+ /**
+ * 鑾峰彇鍗曚釜璺伅淇℃伅
+ *
+ * @param deviceCode 璁惧鐮�
+ * @return
+ */
+ public Light getLight(String deviceCode) {
+ Light one = getOne(Wrappers.<Light>lambdaQuery().eq(Light::getDeviceCode, deviceCode));
+ Object o = redisService.get(LightKey.REPORT_MAC.key(deviceCode));
+ if (o != null) {
+ one.setOnlineStatus(1);
+ } else {
+ one.setOnlineStatus(0);
+ }
+ return one;
+ }
+
public boolean addRemark(LightRemarkParam param) {
Light light = getById(param.getLightId());
- if(light == null){
+ if (light == null) {
throw new BusinessException("鎵句笉鍒拌矾鐏�");
}
Light update = new Light();
@@ -104,19 +157,341 @@
/**
* 鍗曠伅浜害鎺у埗
- * @param param
+ *
* @return com.sandu.ximon.dao.enums.DeviceRespStatusEnums
*/
- public Integer controlBrightness(LightControlParam param) {
-
- A5LightBrightnessReqInnerFrame lightControlFrame = new A5LightBrightnessReqInnerFrame(param.getBrightness());
- A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_LIGHT_DATA.getCode(), lightControlFrame);
- WrapResponseCommonFrame<A5LightBrightnessRespInnerFrame> frame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC(param.getDeviceCode(), a5Frame, A5LightBrightnessRespInnerFrame.class);
- if(frame == null){
- throw new BusinessException("鍙戦�佽姹傚け璐�");
+ public List<Map<String, Object>> controlBrightness(List<LightControlParam> paramList) {
+ if (CollectionUtil.isEmpty(paramList)) {
+ throw new BusinessException("鍙傛暟涓嶈兘涓虹┖");
}
- String responseStatus = frame.getResponseInnerFrame().getResponseStatus();
- return HexUtil.hexToInt(responseStatus);
+
+ List<Map<String, Object>> resultList = new ArrayList<>();
+ for (LightControlParam param : paramList) {
+ A5LightBrightnessReqInnerFrame lightControlFrame = new A5LightBrightnessReqInnerFrame(param.getBrightness(), param.getLightAddress());
+ A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_LIGHT_DATA.getCode(), lightControlFrame);
+ Map<String, Object> map = new HashMap<>();
+ try {
+ map.put("deviceCode", param.getDeviceCode());
+ WrapResponseCommonFrame<A5LightBrightnessRespInnerFrame> frame = MainBoardInvokeSyncService.getInstance()
+ .sendRRPC(param.getDeviceCode(), a5Frame, A5LightBrightnessRespInnerFrame.class);
+ if (frame == null) {
+ map.put("status", DeviceRespStatusEnums.OTHER_ERROR.getCode());
+ resultList.add(map);
+ continue;
+ }
+ String responseStatus = frame.getResponseInnerFrame().getResponseStatus();
+ int status = HexUtil.hexToInt(responseStatus);
+ map.put("status", status);
+ resultList.add(map);
+
+ // 鏇存柊浜害鎴愬姛锛屼慨鏀瑰埌鏁版嵁搴�
+ if (DeviceRespStatusEnums.SUCCESS.getCode().equals(status)) {
+ Light light = new Light();
+ light.setLightPercent(param.getBrightness());
+ update(light, Wrappers.lambdaUpdate(Light.class).eq(Light::getDeviceCode, param.getDeviceCode()));
+ }
+ } catch (BusinessException e) {
+ map.put("status", DeviceRespStatusEnums.OTHER_ERROR.getCode());
+ resultList.add(map);
+ }
+ }
+
+ return resultList;
+ }
+
+ /**
+ * 鍗曠伅鑺傝兘鐜�
+ *
+ * @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();
+
+ 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));
+ }
+
+
+ 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);
+// }
+
+
+ /**
+ * 鐢ㄦ埛鎷ユ湁鐨勮矾鐏�
+ *
+ * @return
+ */
+ public List<Light> listLight() {
+ List<LightBo> listLight;
+ if (SecurityUtils.getClientId() != null) {
+ listLight = baseMapper.listLight(SecurityUtils.getUserId(), null);
+ } else {
+ listLight = baseMapper.listLight(null, null);
+ }
+ List<Light> lightList = new ArrayList<>();
+ for (LightBo bean : listLight) {
+ Light light = getLight(bean.getDeviceCode());
+ lightList.add(light);
+ }
+ return lightList;
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鎵�鏈夌殑璁惧鐮�
+ */
+ public CommonPage<String> listDeviceCode(int pageNo, int pageSize, String keyword, String deviceCode) {
+ List<String> list;
+ if (SecurityUtils.getClientId() != null) {
+ PageHelper.startPage(pageNo, pageSize);
+ list = baseMapper.listCode(SecurityUtils.getUserId(), keyword, deviceCode);
+ } else {
+
+ PageHelper.startPage(pageNo, pageSize);
+ list = baseMapper.listCode(null, keyword, deviceCode);
+ }
+
+ return CommonPage.restPage(list);
+ }
+
+ public boolean setPower(List<Long> ids, Integer power1, Integer power2) {
+ List<Light> lights = listByIds(ids);
+ lights.forEach(light -> {
+ light.setPower1(power1);
+ light.setPower2(power2);
+ }
+ );
+ return updateBatchById(lights);
}
}
--
Gitblit v1.9.3