From f81b7065a40d1f9428d204b3bd6bcd126f306a19 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 10 八月 2022 17:04:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 63fe79f..3be9958 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
@@ -1031,6 +1031,16 @@
lights.forEach(light -> {
light.setPower1(lightPowerSettingParam.getPower1());
light.setPower2(lightPowerSettingParam.getPower2());
+ if (lightPowerSettingParam.getPower1() != null) {
+ light.setLight1(1);
+ } else {
+ light.setLight1(0);
+ }
+ if (lightPowerSettingParam.getPower2() != null) {
+ light.setLight2(1);
+ } else {
+ light.setLight2(0);
+ }
light.setLightCount(lightPowerSettingParam.getLightCount());
});
return updateBatchById(lights);
--
Gitblit v1.9.3