From f2dfd5e6fbbb9c4e96e91c86be0bb6f7a44d87c3 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 18 四月 2022 11:56:21 +0800
Subject: [PATCH] LED屏列表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 68 ++++++++++++++++++++++++++--------
1 files changed, 52 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 ec78044..fa7e706 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
@@ -22,6 +22,8 @@
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;
@@ -46,6 +48,8 @@
private final RedisService redisService;
private final LightReportDataService lightReportDataService;
+ private final PoleBindingService bindingService;
+ private final PoleService poleService;
/**
* 褰曞叆褰撳墠璁惧鐮佺殑璺伅鏁版嵁
@@ -94,6 +98,17 @@
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());
@@ -104,6 +119,22 @@
}
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) {
@@ -131,25 +162,30 @@
for (LightControlParam param : paramList) {
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);
Map<String, Object> map = new HashMap<>();
- map.put("deviceCode", param.getDeviceCode());
- if (frame == null) {
+ 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);
- 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()));
}
}
--
Gitblit v1.9.3