Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit e7175bc7 by huangjy
Options

fix: 调整时间

parent dd21ef86
Inline Side-by-side
Showing with 20 additions and 22 deletions
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderRealTimeServiceImpl.java
...@@ -382,46 +382,44 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService { ...@@ -382,46 +382,44 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
} }
return vo; 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()); DeviceInfoContentBreathe deviceInfoContentBreathe = getNowDataBreathe(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
if (deviceInfoContentBreathe == null) { if (deviceInfoContentBreathe == null) {
return new PlatElderRealTimeHeartRespiratoryVO(); return vo;
} }
int count = 10;
int heartRate = deviceInfoContentBreathe.getProperties().getHr(); int heartRate = deviceInfoContentBreathe.getProperties().getHr();
int respiratoryRate = deviceInfoContentBreathe.getProperties().getBr(); int respiratoryRate = deviceInfoContentBreathe.getProperties().getBr();
int body = deviceInfoContentBreathe.getProperties().getBodymove(); int body = deviceInfoContentBreathe.getProperties().getBodymove();
for (int i = 0; i < count; i++) { int person = deviceInfoContentBreathe.getProperties().getPerson();
PlatElderRealTimeHeartRespiratoryVO platElderRealTimeHeartRespiratoryVO = new PlatElderRealTimeHeartRespiratoryVO();
platElderRealTimeHeartRespiratoryVO.setTime(LocalDateTime.now().plusSeconds(i));
if (i ==0) {
platElderRealTimeHeartRespiratoryVO.setHeartRate(heartRate);
platElderRealTimeHeartRespiratoryVO.setRespiratoryRate(respiratoryRate);
platElderRealTimeHeartRespiratoryVO.setBody(body);
} else {
if (heartRate == 0) { if (heartRate == 0) {
platElderRealTimeHeartRespiratoryVO.setHeartRate(0); vo.setHeartRate(0);
} else { } else {
int hrRange = RandomUtils.nextInt(1, 11) - 5; int hrRange = RandomUtils.nextInt(1, 11) - 5;
platElderRealTimeHeartRespiratoryVO.setHeartRate(Math.max(heartRate + hrRange,0)); vo.setHeartRate(Math.max(heartRate + hrRange,0));
} }
if (respiratoryRate == 0) { if (respiratoryRate == 0) {
platElderRealTimeHeartRespiratoryVO.setRespiratoryRate(0); vo.setRespiratoryRate(0);
} else { } else {
int brRange = RandomUtils.nextInt(1, 7) - 3; int brRange = RandomUtils.nextInt(1, 7) - 3;
platElderRealTimeHeartRespiratoryVO.setRespiratoryRate(Math.max(respiratoryRate + brRange,0)); vo.setRespiratoryRate(Math.max(respiratoryRate + brRange,0));
} }
if (body == 0) { if (body == 0) {
platElderRealTimeHeartRespiratoryVO.setBody(body); vo.setBody(body);
} else { } else {
int hrRange = RandomUtils.nextInt(1, 11) - 5; 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)); redisTemplate.opsForList().leftPush(ELDER_BR_HR + platElderIdDTO.getElderId(),JSON.toJSONString(platElderRealTimeHeartRespiratoryVO));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment