From 9330e9b0e4e70151d36084ecb5695b818cfda2db Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 19 四月 2022 16:07:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 191 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 179 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 dfa16dd..481e2fa 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,25 +1,42 @@
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;
import com.github.pagehelper.PageHelper;
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.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;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
+import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
+import com.sandu.ximon.admin.param.LightControlParam;
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.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.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -34,23 +51,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("鏇存柊璺伅浜害");
}
}
@@ -64,15 +94,26 @@
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())){
+ if (StrUtil.equals(lightBo.getDeviceCode(), lightReportData.getDeviceCode())) {
lightBo.setReportTime(lightReportData.getCreateTime());
break;
}
@@ -83,9 +124,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();
@@ -93,4 +151,113 @@
update.setRemark(param.getRemark());
return updateById(update);
}
+
+ /**
+ * 鍗曠伅浜害鎺у埗
+ *
+ * @return com.sandu.ximon.dao.enums.DeviceRespStatusEnums
+ */
+ public List<Map<String, Object>> controlBrightness(List<LightControlParam> paramList) {
+ if (CollectionUtil.isEmpty(paramList)) {
+ throw new BusinessException("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ List<Map<String, Object>> resultList = new ArrayList<>();
+ for (LightControlParam param : paramList) {
+ A5LightBrightnessReqInnerFrame lightControlFrame = new A5LightBrightnessReqInnerFrame(param.getBrightness());
+ 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 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<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));
+
+
+ LocalDateTime dateTime = LocalDateTime.now();
+ dateTime.plusDays(7L);
+ reportDataList.forEach(
+ reportData -> {
+ LocalDateTime createTime = reportData.getCreateTime();
+ if(dateTime.plusDays(-1L).getDayOfMonth()==createTime.getDayOfMonth()){
+
+ }
+ }
+ );
+
+
+ Map map = new HashMap();
+ map.put("-1", null);
+
+
+ return reportDataList;
+ }
+
+ /**
+ * 鐢ㄦ埛鎷ユ湁鐨勮矾鐏�
+ *
+ * @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;
+ }
+
}
--
Gitblit v1.9.3