changes

liuhaonan

2022-08-12 b9e1aef87da450d99587b56dbb31323fc6e0f3ea

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java

@@ -1031,13 +1031,21 @@
        lights.forEach(light -> {
            light.setPower1(lightPowerSettingParam.getPower1());
            light.setPower2(lightPowerSettingParam.getPower2());
            if (lightPowerSettingParam.getPower1() != null) {
            //存在非0功率  即为存在该灯头
            if (lightPowerSettingParam.getPower1() != null || lightPowerSettingParam.getPower1() != 0) {
                light.setLight1(1);
            } else if (lightPowerSettingParam.getPower1() == 0) {
                //手动设置灯头功率为0  即不存在该灯头
                light.setLight1(0);
            } else {
                light.setLight1(0);
            }
            if (lightPowerSettingParam.getPower2() != null) {
            //存在非0功率  即为存在该灯头
            if (lightPowerSettingParam.getPower2() != null || lightPowerSettingParam.getPower2() != 0) {
                light.setLight2(1);
            } else if (lightPowerSettingParam.getPower2() == 0) {
                //手动设置灯头功率为0  即不存在该灯头
                light.setLight2(0);
            } else {
                light.setLight2(0);
            }