fix: 状态兼容睡眠

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderRealTimeServiceImpl.java

@@ -199,8 +199,16 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
                         Integer bodymove = Integer.valueOf(result.getString("bodymove"));
                         return bodymove.compareTo(sleepTimeActionThreshold) <= 0;
                     };
-                    boolean sleepFlag = values.stream().allMatch(predicate);
-                    if (sleepFlag) {
+                    int count = 0;
+                    for (Object entity : values) {
+                        JSONObject result = JSON.parseObject(entity.toString());
+                        Integer bodymove = Integer.valueOf(result.getString("bodymove"));
+                        boolean b = bodymove.compareTo(sleepTimeActionThreshold) <= 0;
+                        if (b) {
+                            count++;
+                        }
+                    }
+                    if (values.size() - count <= 3) {
                         log.info("当前属于在床睡眠：" + platElderIdDTO.getElderId());
                         platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.SLEEP.getValue());
                         return platElderRealTimeNowVO;

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

@@ -124,14 +124,14 @@ public class PushCallback implements MqttCallback {
             // 缓存呼吸设备某段时间的数据，hash 最大长度 duration
             long duration = getSleepTimeActionDuration();
             long size = redisTemplate.opsForHash().size(DEVICE_BR_ANALYSIS + device.getDeviceId());
-
-            redisTemplate.opsForHash().put(DEVICE_BR_ANALYSIS + device.getDeviceId(), currentSecond,JSON.toJSONString(device.getProperties()));
-            redisTemplate.expire(DEVICE_BR_ANALYSIS + device.getDeviceId(),duration + 3,TimeUnit.MINUTES);
             if (size == duration) {
                 redisTemplate.opsForHash().delete(DEVICE_BR_ANALYSIS + device.getDeviceId(),currentSecond - duration);
-            }else if (size > duration) {
+            }else if (size - duration >= 3) {
                 redisTemplate.delete(Objects.requireNonNull(redisTemplate.keys(DEVICE_BR_ANALYSIS + device.getDeviceId())));
             }
+            redisTemplate.opsForHash().put(DEVICE_BR_ANALYSIS + device.getDeviceId(), currentSecond,JSON.toJSONString(device.getProperties()));
+            redisTemplate.expire(DEVICE_BR_ANALYSIS + device.getDeviceId(),duration + 3,TimeUnit.MINUTES);
+
             redisTemplate.opsForValue().set(DEVICE_BR_DATA + device.getDeviceId(),JSON.toJSONString(device.getProperties()),
                     5000, TimeUnit.MILLISECONDS);
         }