fix: 状态bug

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

@@ -234,6 +234,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
             // 无人
             // 无人
             Map<Object, Object> entries = redisTemplate.opsForHash().entries(DEVICE_SPACE_TEMP_DATA + device.getOriDeviceId());
             Map<Object, Object> entries = redisTemplate.opsForHash().entries(DEVICE_SPACE_TEMP_DATA + device.getOriDeviceId());
             if (entries.isEmpty()) {
             if (entries.isEmpty()) {
+                spaceNoPersonFlag = true;
                 continue;
                 continue;
             }
             }
             Collection<Object> values = entries.values();
             Collection<Object> values = entries.values();
@@ -281,6 +282,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
             // 无人
             // 无人
             Map<Object, Object> entries = redisTemplate.opsForHash().entries(DEVICE_FALL_TEMP_DATA + device.getOriDeviceId());
             Map<Object, Object> entries = redisTemplate.opsForHash().entries(DEVICE_FALL_TEMP_DATA + device.getOriDeviceId());
             if (entries.isEmpty()) {
             if (entries.isEmpty()) {
+                fallNoPersonFlag = true;
                 continue;
                 continue;
             }
             }
             Collection<Object> values = entries.values();
             Collection<Object> values = entries.values();
@@ -329,16 +331,16 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
                 sportFlag = false;
                 sportFlag = false;
             }
             }
         }
         }
-        if (brNoPersonFlag && spaceNoPersonFlag && fallNoPersonFlag) {
-            log.info("所有设备都无人，判断为外出：" + platElderIdDTO.getElderId());
-            platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.OUT.getValue());
-            return platElderRealTimeNowVO;
-        }
         if (!sportFlag) {
         if (!sportFlag) {
             log.info("当前属于离床静息：" + platElderIdDTO.getElderId());
             log.info("当前属于离床静息：" + platElderIdDTO.getElderId());
             platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.REST.getValue());
             platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.REST.getValue());
             return platElderRealTimeNowVO;
             return platElderRealTimeNowVO;
         }
         }
+        if (brNoPersonFlag && spaceNoPersonFlag && fallNoPersonFlag) {
+            log.info("所有设备都无人，判断为外出：" + platElderIdDTO.getElderId());
+            platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.OUT.getValue());
+            return platElderRealTimeNowVO;
+        }
 
 
         log.info("当前设备无状态匹配直接返回：" + platElderIdDTO.getElderId());
         log.info("当前设备无状态匹配直接返回：" + platElderIdDTO.getElderId());
         return platElderRealTimeNowVO;
         return platElderRealTimeNowVO;