Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 89b4ddbb by huangjy
Options

feat: 运动状态

parent 7cc7f116
Inline Side-by-side
Showing with 9 additions and 6 deletions
server-service/src/main/java/com/makeit/service/platform/workstation/impl/WorkStationServiceImpl.java
...@@ -305,9 +305,9 @@ public class WorkStationServiceImpl implements WorkStationService { ...@@ -305,9 +305,9 @@ public class WorkStationServiceImpl implements WorkStationService {
PlatElderIdDTO platElderIdDTO = new PlatElderIdDTO(); PlatElderIdDTO platElderIdDTO = new PlatElderIdDTO();
platElderIdDTO.setElderId(r.getElderId()); platElderIdDTO.setElderId(r.getElderId());
PlatElderRealTimeHeartRespiratoryVO heartRespiratoryVO = platElderRealTimeService.heartRespiratory(platElderIdDTO);
r.setElderStatus(heartRespiratoryVO.getStatus());
PlatElderRealTimeNowVO realTimeNowVO = platElderRealTimeService.nowStatus(platElderIdDTO);
r.setElderStatus(realTimeNowVO.getStatus());
PlatRoomBedDevice platRoomBedDevice = bedDeviceMap.get(r.getBedId()); PlatRoomBedDevice platRoomBedDevice = bedDeviceMap.get(r.getBedId());
if (platRoomBedDevice != null) { if (platRoomBedDevice != null) {
PlatDevice platDevice = deviceMap.get(platRoomBedDevice.getDeviceId()); PlatDevice platDevice = deviceMap.get(platRoomBedDevice.getDeviceId());
...@@ -619,7 +619,8 @@ public class WorkStationServiceImpl implements WorkStationService { ...@@ -619,7 +619,8 @@ public class WorkStationServiceImpl implements WorkStationService {
platElderIdDTO.setElderId(vo.getElderId()); platElderIdDTO.setElderId(vo.getElderId());
PlatElderRealTimeHeartRespiratoryVO respiratoryVO = platElderRealTimeService.heartRespiratory(platElderIdDTO); PlatElderRealTimeHeartRespiratoryVO respiratoryVO = platElderRealTimeService.heartRespiratory(platElderIdDTO);
vo.setElderStatus(respiratoryVO.getStatus()); PlatElderRealTimeNowVO realTimeNowVO = platElderRealTimeService.nowStatus(platElderIdDTO);
vo.setElderStatus(realTimeNowVO.getStatus());
vo.setHeartRate(respiratoryVO.getHeartRate()); vo.setHeartRate(respiratoryVO.getHeartRate());
vo.setRespiratoryRate(respiratoryVO.getRespiratoryRate()); vo.setRespiratoryRate(respiratoryVO.getRespiratoryRate());
......
server-service/src/main/java/com/makeit/service/wechat/impl/PlatElderCenterWechatServiceImpl.java
...@@ -121,7 +121,8 @@ public class PlatElderCenterWechatServiceImpl implements PlatElderCenterWechatSe ...@@ -121,7 +121,8 @@ public class PlatElderCenterWechatServiceImpl implements PlatElderCenterWechatSe
PlatElderIdDTO platElderIdDTO = new PlatElderIdDTO(); PlatElderIdDTO platElderIdDTO = new PlatElderIdDTO();
platElderIdDTO.setElderId(vo.getElderId()); platElderIdDTO.setElderId(vo.getElderId());
PlatElderRealTimeHeartRespiratoryVO heartRespiratoryVO = platElderRealTimeService.heartRespiratory(platElderIdDTO); PlatElderRealTimeHeartRespiratoryVO heartRespiratoryVO = platElderRealTimeService.heartRespiratory(platElderIdDTO);
vo.setElderStatus(heartRespiratoryVO.getStatus()); PlatElderRealTimeNowVO realTimeNowVO = platElderRealTimeService.nowStatus(platElderIdDTO);
vo.setElderStatus(realTimeNowVO.getStatus());
vo.setHeartRate(heartRespiratoryVO.getHeartRate()); vo.setHeartRate(heartRespiratoryVO.getHeartRate());
vo.setRespiratoryRate(heartRespiratoryVO.getRespiratoryRate()); vo.setRespiratoryRate(heartRespiratoryVO.getRespiratoryRate());
} }
...@@ -199,8 +200,9 @@ public class PlatElderCenterWechatServiceImpl implements PlatElderCenterWechatSe ...@@ -199,8 +200,9 @@ public class PlatElderCenterWechatServiceImpl implements PlatElderCenterWechatSe
PlatElderIdDTO platElderIdDTO = new PlatElderIdDTO(); PlatElderIdDTO platElderIdDTO = new PlatElderIdDTO();
platElderIdDTO.setElderId(r.getElderId()); platElderIdDTO.setElderId(r.getElderId());
PlatElderRealTimeHeartRespiratoryVO respiratoryVO = platElderRealTimeService.heartRespiratory(platElderIdDTO);
r.setElderStatus(respiratoryVO.getStatus()); PlatElderRealTimeNowVO realTimeNowVO = platElderRealTimeService.nowStatus(platElderIdDTO);
r.setElderStatus(realTimeNowVO.getStatus());
/*PlatElderRealTimeNowVO nowStatus = platElderRealTimeService.nowStatus(platElderIdDTO); /*PlatElderRealTimeNowVO nowStatus = platElderRealTimeService.nowStatus(platElderIdDTO);
if(nowStatus.getStatus()!=null){ if(nowStatus.getStatus()!=null){
DeviceInfoContentBreathe deviceInfoContentBreathe = workStationService.getNowDataBreathe(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId()); DeviceInfoContentBreathe deviceInfoContentBreathe = workStationService.getNowDataBreathe(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
......
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