feat：非空判断

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

@@ -51,7 +51,7 @@ public class OffBedAlarm implements IAlarm {
     public void checkConfig(PlatAlarmCheckDTO platAlarmCheckDTO) {
     public void checkConfig(PlatAlarmCheckDTO platAlarmCheckDTO) {
         PlatDevice platDevice = platAlarmCheckDTO.getPlatDevice();
         PlatDevice platDevice = platAlarmCheckDTO.getPlatDevice();
         platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
         platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
-        log.info("执行离床checkConfig方法：");
+        //log.info("执行离床checkConfig方法：");
         List<PlatElder> platElderList = platAlarmCheckDTO.getPlatElderList();
         List<PlatElder> platElderList = platAlarmCheckDTO.getPlatElderList();
         if (CollectionUtils.isEmpty(platElderList)) {
         if (CollectionUtils.isEmpty(platElderList)) {
             log.error("离床告警心率设备未关联长者，设备plat_id:" + platAlarmCheckDTO.getPlatDevice().getId());
             log.error("离床告警心率设备未关联长者，设备plat_id:" + platAlarmCheckDTO.getPlatDevice().getId());

server-web/src/main/java/com/makeit/mqtt/PushCallback.java

@@ -27,6 +27,7 @@ import com.makeit.service.saas.PlatTenantService;
 import com.makeit.service.saas.SaasSleepAnalysisModelService;
 import com.makeit.service.saas.SaasSleepAnalysisModelService;
 import com.makeit.utils.AlarmConfigCacheUtil;
 import com.makeit.utils.AlarmConfigCacheUtil;
 import com.makeit.utils.DeviceCacheUtil;
 import com.makeit.utils.DeviceCacheUtil;
+import com.makeit.utils.old.StringUtils;
 import com.makeit.utils.redis.RedisUtil;
 import com.makeit.utils.redis.RedisUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
@@ -195,7 +196,7 @@ public class PushCallback implements MqttCallback {
         String messageType = device.getMessageType();
         String messageType = device.getMessageType();
         //更新设备状态
         //更新设备状态
         platDeviceService.updateDeviceStatus(messageType, deviceId, "");
         platDeviceService.updateDeviceStatus(messageType, deviceId, "");
-        if (org.apache.commons.lang3.StringUtils.equalsAnyIgnoreCase(messageType, DeviceState.online.getValue())) {
+        if (StringUtils.equalsAnyIgnoreCase(messageType, DeviceState.online.getValue())) {
             return;
             return;
         }
         }
         for (HeaderInfo.Bind binding : bindings) {
         for (HeaderInfo.Bind binding : bindings) {
@@ -238,7 +239,9 @@ public class PushCallback implements MqttCallback {
                             platAlarmCheckDTO.setProperties(properties);
                             platAlarmCheckDTO.setProperties(properties);
                             //设备状态
                             //设备状态
                             platAlarmCheckDTO.setMessageType(messageType);
                             platAlarmCheckDTO.setMessageType(messageType);
+                            if (properties != null) {
                                 platAlarmCheckDTO.setDeviceTime(properties.getString("alarmId"));
                                 platAlarmCheckDTO.setDeviceTime(properties.getString("alarmId"));
+                            }
                             alarm.checkConfig(platAlarmCheckDTO);
                             alarm.checkConfig(platAlarmCheckDTO);
                         }
                         }
                     }
                     }