Skip to content

T
TDLCloud
Commit 46b8f645 authored by Carit Zhu's avatar Carit Zhu 🎱
Browse files
Options

Merge branch 'tdl_bosch_offset' into 'tdl_bosch' 

Add offset != null judgement for saveAlarmRule

See merge request !3
parents fafe8f49 39627f24
Pipeline #456 passed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 2 additions and 2 deletions
    src/main/java/com/example/tdl/util/AlarmRule.java
    View file @ 46b8f645
    ......@@ -47,7 +47,7 @@ public class AlarmRule {
    alarmRuleVo.setMinval(alarmVo.getTemMin());
    alarmRuleVo.setMode("twoway");
    }
    if (offset.getTempOffset() != null) {
    if (offset != null && offset.getTempOffset() != null) {
    alarmRuleVo.setOffset(offset.getTempOffset());
    } else {
    alarmRuleVo.setOffset(0.0);
    ......@@ -65,7 +65,7 @@ public class AlarmRule {
    alarmRuleVo.setMinval(alarmVo.getHumidityMin());
    alarmRuleVo.setMode("twoway");
    }
    if (offset.getHumidityOffset() != null) {
    if (offset != null && offset.getHumidityOffset() != null) {
    alarmRuleVo.setOffset(offset.getHumidityOffset());
    } else {
    alarmRuleVo.setOffset(0.0);
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment