Merge branch 'dev' of http://git.xmmakeit.com/huangjiay/iot-platform-server into dev

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

@@ -50,6 +50,7 @@ public class FallAlarm implements IAlarm {
         if(alarmRedisDTO==null){
             alarmRedisDTO = new AlarmRedisDTO();
             alarmRedisDTO.setAlarm(CommonEnum.NO.getValue());
+            RedisUtil.set(RedisConst.ALARM_DEVICE_FALL_ID+ deviceId, alarmRedisDTO);
         }
         if (StringUtils.equals(personState, CommonEnum.YES.getValue())) {
             if (StringUtils.equals(alarmRedisDTO.getAlarm(),CommonEnum.YES.getValue())){
@@ -58,10 +59,12 @@ public class FallAlarm implements IAlarm {
             }
             notice(platAlarmCheckDTO);
             alarmRedisDTO.setAlarm(CommonEnum.YES.getValue());
-            RedisUtil.set(RedisConst.ALARM_DEVICE_FALL_ID, alarmRedisDTO);
+            RedisUtil.set(RedisConst.ALARM_DEVICE_FALL_ID+ deviceId, alarmRedisDTO);
         } else {
+            if(StringUtils.equals(alarmRedisDTO.getAlarm(),CommonEnum.YES.getValue())) {
                 alarmRedisDTO.setAlarm(CommonEnum.NO.getValue());
-            RedisUtil.set(RedisConst.ALARM_DEVICE_FALL_ID, alarmRedisDTO);
+                RedisUtil.set(RedisConst.ALARM_DEVICE_FALL_ID+ deviceId, alarmRedisDTO);
+            }
         }
     }