fix

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

@@ -47,9 +47,14 @@ public class FallAlarm implements IAlarm {
         String deviceId = platDevice.getOriDeviceId();
         String deviceId = platDevice.getOriDeviceId();
         String personState = Convert.toStr(properties.get("personState"));
         String personState = Convert.toStr(properties.get("personState"));
         AlarmRedisDTO alarmRedisDTO = RedisUtil.get(RedisConst.ALARM_DEVICE_FALL_ID + deviceId);
         AlarmRedisDTO alarmRedisDTO = RedisUtil.get(RedisConst.ALARM_DEVICE_FALL_ID + deviceId);
+        if(alarmRedisDTO==null){
+            alarmRedisDTO = new AlarmRedisDTO();
+            alarmRedisDTO.setAlarm(CommonEnum.NO.getValue());
+        }
         if (StringUtils.equals(personState, CommonEnum.YES.getValue())) {
         if (StringUtils.equals(personState, CommonEnum.YES.getValue())) {
             if (StringUtils.equals(alarmRedisDTO.getAlarm(),CommonEnum.YES.getValue())){
             if (StringUtils.equals(alarmRedisDTO.getAlarm(),CommonEnum.YES.getValue())){
                 log.error("长者跌倒，已告警过，设备iot_id:"+deviceId);
                 log.error("长者跌倒，已告警过，设备iot_id:"+deviceId);
+                return;
             }
             }
             notice(platAlarmCheckDTO);
             notice(platAlarmCheckDTO);
             alarmRedisDTO.setAlarm(CommonEnum.YES.getValue());
             alarmRedisDTO.setAlarm(CommonEnum.YES.getValue());

server-web/src/main/resources/application-dev.yml

@@ -119,7 +119,7 @@ mqtt:
   defaultTopic: /device/*/*/**
   defaultTopic: /device/*/*/**
   timeout: 10
   timeout: 10
   keepalive: 60
   keepalive: 60
-  msgSwitch: false
+  msgSwitch: true
 
 
 wx:
 wx:
   miniapp:
   miniapp: