fix: 离床告警未过滤设备类型

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

@@ -10,6 +10,7 @@ import com.makeit.entity.platform.device.PlatDevice;
 import com.makeit.entity.platform.elder.PlatElder;
 import com.makeit.entity.platform.elder.PlatElder;
 import com.makeit.enums.CommonEnum;
 import com.makeit.enums.CommonEnum;
 import com.makeit.enums.platform.alarm.PlatAlarmConfigEnum;
 import com.makeit.enums.platform.alarm.PlatAlarmConfigEnum;
+import com.makeit.enums.platform.device.PlatDeviceEnum;
 import com.makeit.enums.redis.RedisConst;
 import com.makeit.enums.redis.RedisConst;
 import com.makeit.service.platform.alarm.PlatAlarmRecordService;
 import com.makeit.service.platform.alarm.PlatAlarmRecordService;
 import com.makeit.utils.AlarmConfigCacheUtil;
 import com.makeit.utils.AlarmConfigCacheUtil;
@@ -50,6 +51,9 @@ public class OffBedAlarm implements IAlarm {
     @Override
     @Override
     public void checkConfig(PlatAlarmCheckDTO platAlarmCheckDTO) {
     public void checkConfig(PlatAlarmCheckDTO platAlarmCheckDTO) {
         PlatDevice platDevice = platAlarmCheckDTO.getPlatDevice();
         PlatDevice platDevice = platAlarmCheckDTO.getPlatDevice();
+        if (!PlatDeviceEnum.CategoryEnum.HEART.getValue().equals(platDevice.getCategory())) {
+            return;
+        }
         platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
         platAlarmRecordService.getElderListByDeviceId(platAlarmCheckDTO);
         //log.info("执行离床checkConfig方法：");
         //log.info("执行离床checkConfig方法：");
         List<PlatElder> platElderList = platAlarmCheckDTO.getPlatElderList();
         List<PlatElder> platElderList = platAlarmCheckDTO.getPlatElderList();

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

@@ -13,6 +13,7 @@ import com.makeit.entity.platform.device.PlatDevice;
 import com.makeit.entity.saas.PlatTenant;
 import com.makeit.entity.saas.PlatTenant;
 import com.makeit.entity.saas.analysis.SaasSleepAnalysisModel;
 import com.makeit.entity.saas.analysis.SaasSleepAnalysisModel;
 import com.makeit.enums.platform.alarm.PlatAlarmConfigEnum;
 import com.makeit.enums.platform.alarm.PlatAlarmConfigEnum;
+import com.makeit.enums.platform.device.PlatDeviceEnum;
 import com.makeit.enums.redis.RedisConst;
 import com.makeit.enums.redis.RedisConst;
 import com.makeit.external.strategy.OpenApiBaseStrategy;
 import com.makeit.external.strategy.OpenApiBaseStrategy;
 import com.makeit.external.strategy.OpenApiBaseStrategyFactory;
 import com.makeit.external.strategy.OpenApiBaseStrategyFactory;
@@ -269,7 +270,9 @@ public class PushCallback implements MqttCallbackExtended {
      * @param messageType
      * @param messageType
      */
      */
     private void handleOffBed(PlatDevice platDevice, JSONObject properties, String messageType) {
     private void handleOffBed(PlatDevice platDevice, JSONObject properties, String messageType) {
-
+        if (!PlatDeviceEnum.CategoryEnum.HEART.getValue().equals(platDevice.getCategory())) {
+            return;
+        }
         List<PlatDevice> platDeviceList = deviceCacheUtil.getByDeviceId(platDevice.getOriDeviceId());
         List<PlatDevice> platDeviceList = deviceCacheUtil.getByDeviceId(platDevice.getOriDeviceId());
         if (CollUtil.isEmpty(platDeviceList)) {
         if (CollUtil.isEmpty(platDeviceList)) {
             return;
             return;