Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 107db3f2 by huangjy
Options

fix: 修复bug

parent af6c13b9
Inline Side-by-side
Showing with 16 additions and 14 deletions
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderRealTimeServiceImpl.java
...@@ -292,7 +292,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService { ...@@ -292,7 +292,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
@Override @Override
public PlatElderRealTimeNowVO nowStatus(PlatElderIdDTO platElderIdDTO) { public PlatElderRealTimeNowVO nowStatus(PlatElderIdDTO platElderIdDTO) {
PlatElderRealTimeNowVO platElderRealTimeNowVO = new PlatElderRealTimeNowVO(); PlatElderRealTimeNowVO platElderRealTimeNowVO = new PlatElderRealTimeNowVO();
platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.OUT.getValue()); platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.RUN.getValue());
PlatDevice platDevice = getBreathDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId()); PlatDevice platDevice = getBreathDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
if (platDevice == null) { if (platDevice == null) {
return platElderRealTimeNowVO; return platElderRealTimeNowVO;
...@@ -361,19 +361,21 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService { ...@@ -361,19 +361,21 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
String result = redisTemplate.opsForValue().get(DEVICE_BR_DATA + platDevice.getOriDeviceId()); String result = redisTemplate.opsForValue().get(DEVICE_BR_DATA + platDevice.getOriDeviceId());
if (result != null) { if (result != null) {
JSONObject jsonObject = JSON.parseObject(result); JSONObject jsonObject = JSON.parseObject(result);
String person = jsonObject.getString("person"); if (jsonObject != null) {
log.info("当前人员人员状态:{}",person); String person = jsonObject.getString("person");
vo.setTime(LocalDateTime.now()); log.info("当前人员人员状态:{}",person);
if (StringUtils.equals(person,"0")) { vo.setTime(LocalDateTime.now());
vo.setHeartRate(0); if (StringUtils.equals(person,"0")) {
vo.setRespiratoryRate(0); vo.setHeartRate(0);
vo.setBody(0); vo.setRespiratoryRate(0);
vo.setStatus(PlatElderRealtimeReportEnum.NowStatus.OUT.getValue()); vo.setBody(0);
} else { vo.setStatus(PlatElderRealtimeReportEnum.NowStatus.RUN.getValue());
vo.setHeartRate(Integer.valueOf(jsonObject.getString("hr"))); } else {
vo.setRespiratoryRate(Integer.valueOf(jsonObject.getString("br"))); vo.setHeartRate(Integer.valueOf(jsonObject.getString("hr")));
vo.setBody(Integer.valueOf(jsonObject.getString("bodymove"))); vo.setRespiratoryRate(Integer.valueOf(jsonObject.getString("br")));
vo.setStatus(PlatElderRealtimeReportEnum.NowStatus.BED.getValue()); vo.setBody(Integer.valueOf(jsonObject.getString("bodymove")));
vo.setStatus(PlatElderRealtimeReportEnum.NowStatus.BED.getValue());
}
} }
return vo; return vo;
} }
......
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