Merge remote-tracking branch 'origin/dev' into dev

server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/BreathAlarm.java

@@ -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/FallAlarm.java

@@ -106,10 +106,11 @@ public class FallAlarm implements IAlarm {
         String ruleConfigStr = config.getRuleConfig();
         String ruleConfigStr = config.getRuleConfig();
         JSONObject properties = platAlarmCheckDTO.getProperties();
         JSONObject properties = platAlarmCheckDTO.getProperties();
         String messageType = platAlarmCheckDTO.getMessageType();
         String messageType = platAlarmCheckDTO.getMessageType();
-
         String deviceId = platDevice.getId();
         String deviceId = platDevice.getId();
+        if(properties == null ){
+            properties = new JSONObject();
+        }
 
 
-        String personState = Convert.toStr(properties.get("personState"));
         String person = Convert.toStr(properties.get("person"));
         String person = Convert.toStr(properties.get("person"));
         PlatAlarmConfigBehaviorDTOVO ruleConfig = JsonUtil.toObj(ruleConfigStr, PlatAlarmConfigBehaviorDTOVO.class);
         PlatAlarmConfigBehaviorDTOVO ruleConfig = JsonUtil.toObj(ruleConfigStr, PlatAlarmConfigBehaviorDTOVO.class);
         Integer duration = ruleConfig.getAverageDuration();//分钟
         Integer duration = ruleConfig.getAverageDuration();//分钟

server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/HeartAlarm.java

@@ -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());