fix：状态判断逻辑变更

server-service/src/main/java/com/makeit/entity/saas/SaasPidManage.java

 package com.makeit.entity.saas;
 package com.makeit.entity.saas;
 
 
 import com.makeit.common.entity.BaseBusEntity;
 import com.makeit.common.entity.BaseBusEntity;
+import com.makeit.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
@@ -17,7 +18,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @Data
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value="SaasPidManage对象", description="声网pid管理")
 @ApiModel(value="SaasPidManage对象", description="声网pid管理")
-public class SaasPidManage extends BaseBusEntity {
+public class SaasPidManage extends BaseEntity {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 

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

@@ -190,7 +190,8 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
             if (StringUtils.equals(person,"1")) {
             if (StringUtils.equals(person,"1")) {
                 // 判断是否在床睡觉
                 // 判断是否在床睡觉
                 Integer sleepTimeActionThreshold = getSleepTimeActionThreshold();
                 Integer sleepTimeActionThreshold = getSleepTimeActionThreshold();
-                Set<String> dataSet = redisTemplate.opsForZSet().rangeByScore(DEVICE_BR_ANALYSIS + platDevice.getOriDeviceId(), currentSecond - 30, currentSecond);
+                Long sleepTimeActionDuration = getSleepTimeActionDuration();
+                Set<String> dataSet = redisTemplate.opsForZSet().rangeByScore(DEVICE_BR_ANALYSIS + platDevice.getOriDeviceId(), currentSecond - sleepTimeActionDuration, currentSecond);
                 if (CollectionUtils.isNotEmpty(dataSet)) {
                 if (CollectionUtils.isNotEmpty(dataSet)) {
                     boolean flag = dataSet.stream().allMatch(s -> {
                     boolean flag = dataSet.stream().allMatch(s -> {
                         JSONObject result = JSON.parseObject(s);
                         JSONObject result = JSON.parseObject(s);
@@ -218,7 +219,6 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
                     return platElderRealTimeNowVO;
                     return platElderRealTimeNowVO;
                 }
                 }
             } else {
             } else {
-                redisTemplate.delete(DEVICE_BR_ANALYSIS + platDevice.getOriDeviceId());
                 brNoPersonFlag = true;
                 brNoPersonFlag = true;
             }
             }
         } else {
         } else {
@@ -336,7 +336,6 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
         if (brNoPersonFlag && spaceNoPersonFlag && fallNoPersonFlag) {
         if (brNoPersonFlag && spaceNoPersonFlag && fallNoPersonFlag) {
             log.info("所有设备都无人，判断为外出：" + platElderIdDTO.getElderId());
             log.info("所有设备都无人，判断为外出：" + platElderIdDTO.getElderId());
             platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.OUT.getValue());
             platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.OUT.getValue());
-            redisTemplate.delete(Objects.requireNonNull(redisTemplate.keys(DEVICE_BR_ANALYSIS + "*")));
             redisTemplate.delete(Objects.requireNonNull(redisTemplate.keys(DEVICE_SPACE_TEMP_DATA + "*")));
             redisTemplate.delete(Objects.requireNonNull(redisTemplate.keys(DEVICE_SPACE_TEMP_DATA + "*")));
             redisTemplate.delete(Objects.requireNonNull(redisTemplate.keys(DEVICE_FALL_TEMP_DATA + "*")));
             redisTemplate.delete(Objects.requireNonNull(redisTemplate.keys(DEVICE_FALL_TEMP_DATA + "*")));
             return platElderRealTimeNowVO;
             return platElderRealTimeNowVO;