Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 34f1def9 by 李小龙 Committed by huangjy
Options

fix:空指针

parent 8c121912
Inline Side-by-side
Showing with 2 additions and 2 deletions
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BreathAlarm.java
...@@ -113,7 +113,7 @@ public class BreathAlarm implements IAlarm { ...@@ -113,7 +113,7 @@ public class BreathAlarm implements IAlarm {
} }
if ((br > end || br < start)) { if ((br > end || br < start) && StringUtils.equalsAnyIgnoreCase(messageType, "REPORT_PROPERTY")) {
if(alarmRedisDTO==null){ if(alarmRedisDTO==null){
alarmRedisDTO = new AlarmRedisDTO(); alarmRedisDTO = new AlarmRedisDTO();
alarmRedisDTO.setAlarm(CommonEnum.NO.getValue()); alarmRedisDTO.setAlarm(CommonEnum.NO.getValue());
......
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/HeartAlarm.java
...@@ -102,7 +102,7 @@ public class HeartAlarm implements IAlarm { ...@@ -102,7 +102,7 @@ public class HeartAlarm implements IAlarm {
return; return;
} }
if ((hr > end || hr < start)) { if ((hr > end || hr < start) && StringUtils.equalsAnyIgnoreCase(messageType, "REPORT_PROPERTY")) {
if(alarmRedisDTO==null){ if(alarmRedisDTO==null){
alarmRedisDTO = new AlarmRedisDTO(); alarmRedisDTO = new AlarmRedisDTO();
alarmRedisDTO.setAlarm(CommonEnum.NO.getValue()); alarmRedisDTO.setAlarm(CommonEnum.NO.getValue());
......
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 sign in to comment