fix: nowStatus接口

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

@@ -289,6 +289,23 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
 
 
     @Override
     @Override
     public PlatElderRealTimeNowVO nowStatus(PlatElderIdDTO platElderIdDTO) {
     public PlatElderRealTimeNowVO nowStatus(PlatElderIdDTO platElderIdDTO) {
+        PlatElderRealTimeNowVO platElderRealTimeNowVO = new PlatElderRealTimeNowVO();
+        platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.OUT.getValue());
+        PlatDevice platDevice = getBreathDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
+        if (platDevice == null) {
+            return platElderRealTimeNowVO;
+        }
+
+        String brResult = redisTemplate.opsForValue().get(DEVICE_BR_DATA + platDevice.getOriDeviceId());
+        if (brResult != null) {
+            JSONObject jsonObject = JSON.parseObject(brResult);
+            String person = jsonObject.getString("person");
+            if (StringUtils.equals(person,"1")) {
+                platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.BED.getValue());
+                return platElderRealTimeNowVO;
+            }
+        }
+
         Object result = RedisUtil.get(ELDER_STATUS + platElderIdDTO.getElderId());
         Object result = RedisUtil.get(ELDER_STATUS + platElderIdDTO.getElderId());
         if (result != null) {
         if (result != null) {
             return JSON.parseObject(result.toString(), PlatElderRealTimeNowVO.class);
             return JSON.parseObject(result.toString(), PlatElderRealTimeNowVO.class);
@@ -296,8 +313,6 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
 
 
         DeviceInfoContentBreathe deviceInfoContentBreathe = getNowDataBreathe(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
         DeviceInfoContentBreathe deviceInfoContentBreathe = getNowDataBreathe(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
 //
 //
-        PlatElderRealTimeNowVO platElderRealTimeNowVO = new PlatElderRealTimeNowVO();
-//
         if (deviceInfoContentBreathe == null) {
         if (deviceInfoContentBreathe == null) {
             return platElderRealTimeNowVO;
             return platElderRealTimeNowVO;
         }
         }