fix: 调整时间

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

@@ -382,46 +382,44 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
             }
             return vo;
         }
-        return vo;
-
- /*       String brResult = redisTemplate.opsForList().rightPop(ELDER_BR_HR + platElderIdDTO.getElderId());
-        if (brResult != null) {
-            return JSON.parseObject(brResult,PlatElderRealTimeHeartRespiratoryVO.class);
-        }
         DeviceInfoContentBreathe deviceInfoContentBreathe = getNowDataBreathe(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
         if (deviceInfoContentBreathe == null) {
-            return new PlatElderRealTimeHeartRespiratoryVO();
+            return vo;
         }
-        int count = 10;
         int heartRate = deviceInfoContentBreathe.getProperties().getHr();
         int respiratoryRate = deviceInfoContentBreathe.getProperties().getBr();
         int body = deviceInfoContentBreathe.getProperties().getBodymove();
-        for (int i = 0; i < count; i++) {
-            PlatElderRealTimeHeartRespiratoryVO platElderRealTimeHeartRespiratoryVO = new PlatElderRealTimeHeartRespiratoryVO();
-            platElderRealTimeHeartRespiratoryVO.setTime(LocalDateTime.now().plusSeconds(i));
-            if (i ==0) {
-                platElderRealTimeHeartRespiratoryVO.setHeartRate(heartRate);
-                platElderRealTimeHeartRespiratoryVO.setRespiratoryRate(respiratoryRate);
-                platElderRealTimeHeartRespiratoryVO.setBody(body);
-            } else {
+        int person = deviceInfoContentBreathe.getProperties().getPerson();
         if (heartRate == 0) {
-                    platElderRealTimeHeartRespiratoryVO.setHeartRate(0);
+            vo.setHeartRate(0);
         } else {
             int hrRange = RandomUtils.nextInt(1, 11) - 5;
-                    platElderRealTimeHeartRespiratoryVO.setHeartRate(Math.max(heartRate + hrRange,0));
+            vo.setHeartRate(Math.max(heartRate + hrRange,0));
         }
         if (respiratoryRate == 0) {
-                    platElderRealTimeHeartRespiratoryVO.setRespiratoryRate(0);
+            vo.setRespiratoryRate(0);
         } else {
             int brRange = RandomUtils.nextInt(1, 7) - 3;
-                    platElderRealTimeHeartRespiratoryVO.setRespiratoryRate(Math.max(respiratoryRate + brRange,0));
+            vo.setRespiratoryRate(Math.max(respiratoryRate + brRange,0));
         }
         if (body == 0) {
-                    platElderRealTimeHeartRespiratoryVO.setBody(body);
+            vo.setBody(body);
         } else {
             int hrRange = RandomUtils.nextInt(1, 11) - 5;
-                    platElderRealTimeHeartRespiratoryVO.setBody(Math.max(body + hrRange,0));
+            vo.setBody(Math.max(body + hrRange,0));
+        }
+        vo.setStatus(person == 1 ? PlatElderRealtimeReportEnum.NowStatus.BED.getValue() : PlatElderRealtimeReportEnum.NowStatus.RUN.getValue());
+        return vo;
+ /*       String brResult = redisTemplate.opsForList().rightPop(ELDER_BR_HR + platElderIdDTO.getElderId());
+        if (brResult != null) {
+            return JSON.parseObject(brResult,PlatElderRealTimeHeartRespiratoryVO.class);
         }
+        if (deviceInfoContentBreathe == null) {
+            return new PlatElderRealTimeHeartRespiratoryVO();
+        }
+        int count = 10;
+
+        for (int i = 0; i < count; i++) {
 
             }
             redisTemplate.opsForList().leftPush(ELDER_BR_HR + platElderIdDTO.getElderId(),JSON.toJSONString(platElderRealTimeHeartRespiratoryVO));