fix:bug 修改

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

 package com.makeit.service.platform.alarm.alarmStrategy;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson.JSONObject;
 import com.makeit.dto.platform.alarm.PlatAlarmCheckDTO;
@@ -62,15 +61,17 @@ public class OffBedAlarm implements IAlarm {
             log.error("离床告警心率设备未关联长者，设备plat_id:" + platAlarmCheckDTO.getPlatDevice().getId());
             return;
         }
-        // PlatAlarmConfig config = alarmConfigCacheUtil.get(platDevice.getOrgId(), PlatAlarmConfigEnum.AlarmTypeEnum.OFF_BED.getValue());
+        PlatAlarmConfig config = alarmConfigCacheUtil.get(platDevice.getOrgId(), PlatAlarmConfigEnum.AlarmTypeEnum.OFF_BED.getValue());
+        log.info("当前config:{},dto config:{}", config.getRuleConfig(), platAlarmCheckDTO.getPlatAlarmConfig().getRuleConfig());
+        offBedCheckAlarm(config, platAlarmCheckDTO, platDevice);
         // PlatAlarmConfig platAlarmConfig = platAlarmCheckDTO.getPlatAlarmConfig();
-        List<PlatAlarmConfig> configList = platAlarmConfigService.listOfBed(platDevice.getId());
-        if (CollUtil.isNotEmpty(configList)) {
-            configList.forEach(c -> {
-                log.info("离床告警dto,org_config:{},设备id：{}", c.getRuleConfig(), platDevice.getId());
-                offBedCheckAlarm(c, platAlarmCheckDTO, platDevice);
-            });
-        }
+        // List<PlatAlarmConfig> configList = platAlarmConfigService.listOfBed(platDevice.getId());
+        // if (CollUtil.isNotEmpty(configList)) {
+        //     configList.forEach(c -> {
+        //         log.info("离床告警dto,org_config:{},设备id：{}", c.getRuleConfig(), platDevice.getId());
+        //         offBedCheckAlarm(c, platAlarmCheckDTO, platDevice);
+        //     });
+        // }
 
     }
 
@@ -242,7 +243,7 @@ public class OffBedAlarm implements IAlarm {
         }
 
         LocalDateTime now = currentTime();
-        LocalTime localTime = LocalTime.now().plusHours(9);
+        LocalTime localTime = LocalTime.now().plusHours(8);
         if (!isInTime && localTime.isAfter(startTime) && localTime.isBefore(endTime)) {
             long mills = Duration.between(startLocalDteTime, now).toMillis() / 1000;
             boolean noInOverTime = mills >= duration * 60;
@@ -322,12 +323,12 @@ public class OffBedAlarm implements IAlarm {
         }
     }
 
-    private long currentLong() {
+    private static long currentLong() {
         return currentTime().toInstant(ZoneOffset.of("+8")).toEpochMilli();
     }
 
-    private LocalDateTime currentTime() {
-        return LocalDateTime.now().plusHours(9);
+    private static LocalDateTime currentTime() {
+        return LocalDateTime.now().plusHours(8);
         // return LocalDateTime.now();
     }
 

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

 package com.makeit.mqtt;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,7 +22,6 @@ import com.makeit.utils.AlarmConfigCacheUtil;
 import com.makeit.utils.DeviceCacheUtil;
 import com.makeit.utils.redis.RedisUtil;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.MqttCallback;
 import org.eclipse.paho.client.mqttv3.MqttClient;
@@ -31,7 +32,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
-import org.springframework.util.StopWatch;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -39,6 +39,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 
 @Component
@@ -205,6 +206,10 @@ public class PushCallback implements MqttCallback {
                     logger.error("该设备没有告警配置,设备iot-id,iot_tenantId:" + deviceId+","+iot_tenantId);
                     return;
                 }
+                List<PlatAlarmConfig> configList = deviceAlarmConfigList.stream().filter(f -> "5".equals(f.getAlarmType())).collect(Collectors.toList());
+                if (CollUtil.isNotEmpty(configList)) {
+                    logger.info("离床预警config集合：{}", JSONUtil.toJsonStr(configList));
+                }
                 for (PlatAlarmConfig config : deviceAlarmConfigList) {
                     String alarmType = config.getAlarmType();