From 620a3be8596434a8796469a8213a0066c836a1d4 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 28 四月 2022 18:22:43 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 bc087e1..51e2048 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
@@ -19,6 +19,7 @@
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.LightPowerSettingParam;
import com.sandu.ximon.admin.param.LightRemarkParam;
import com.sandu.ximon.admin.redis.LightKey;
import com.sandu.ximon.admin.security.SecurityUtils;
@@ -117,7 +118,7 @@
);
for (LightReportData lightReportData : reportDataList) {
if (StrUtil.equals(lightBo.getDeviceCode(), lightReportData.getDeviceCode())) {
- lightBo.setReportTime(lightReportData.getCreateTime());
+ lightBo.setReportTime(lightReportData.getCreateTime1());
break;
}
}
@@ -167,7 +168,7 @@
List<Map<String, Object>> resultList = new ArrayList<>();
for (LightControlParam param : paramList) {
- A5LightBrightnessReqInnerFrame lightControlFrame = new A5LightBrightnessReqInnerFrame(param.getBrightness());
+ 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 {
@@ -485,11 +486,15 @@
return CommonPage.restPage(list);
}
- public boolean setPower(List<Long> ids, Integer power1, Integer power2) {
- List<Light> lights = listByIds(ids);
+ public boolean setPower(LightPowerSettingParam lightPowerSettingParam) {
+ if (lightPowerSettingParam.getLightIds().size() == 0) {
+ throw new BusinessException("鐏潌ID涓嶈兘涓虹┖");
+ }
+ List<Light> lights = listByIds(lightPowerSettingParam.getLightIds());
lights.forEach(light -> {
- light.setPower1(power1);
- light.setPower2(power2);
+ light.setPower1(lightPowerSettingParam.getPower1());
+ light.setPower2(lightPowerSettingParam.getPower2());
+ light.setLightCount(lightPowerSettingParam.getLightCount());
}
);
return updateBatchById(lights);
--
Gitblit v1.9.3