Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 7cc7f116 by huangjy
Options

feat: 进入呼吸也算在床静息

parent f64748d9
Inline Side-by-side
Showing with 8 additions and 0 deletions
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderRealTimeServiceImpl.java
...@@ -329,11 +329,13 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService { ...@@ -329,11 +329,13 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
if (StringUtils.equals(person,"1")) { if (StringUtils.equals(person,"1")) {
// 在床运动 // 在床运动
if (StringUtils.equals(personState,"1")) { if (StringUtils.equals(personState,"1")) {
log.info("当前属于在床运动：" + platElderIdDTO.getElderId());
platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.SPORT.getValue()); platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.SPORT.getValue());
return platElderRealTimeNowVO; return platElderRealTimeNowVO;
} }
// 在床静息 // 在床静息
if (StringUtils.equals(personState,"2") || StringUtils.equals(personState,"2")) { if (StringUtils.equals(personState,"2") || StringUtils.equals(personState,"2")) {
log.info("当前属于在床静息：" + platElderIdDTO.getElderId());
platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.BED.getValue()); platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.BED.getValue());
return platElderRealTimeNowVO; return platElderRealTimeNowVO;
} }
...@@ -348,6 +350,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService { ...@@ -348,6 +350,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
}; };
boolean sleepFlag = values.stream().allMatch(predicate); boolean sleepFlag = values.stream().allMatch(predicate);
if (sleepFlag) { if (sleepFlag) {
log.info("当前属于在床睡眠：" + platElderIdDTO.getElderId());
platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.SLEEP.getValue()); platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.SLEEP.getValue());
return platElderRealTimeNowVO; return platElderRealTimeNowVO;
} }
...@@ -381,6 +384,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService { ...@@ -381,6 +384,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
boolean noPersonFlag = voList.stream().allMatch(e -> e.getPersonState() == 0); boolean noPersonFlag = voList.stream().allMatch(e -> e.getPersonState() == 0);
if (noPersonFlag) { if (noPersonFlag) {
log.info("当前属于外出：" + platElderIdDTO.getElderId());
platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.OUT.getValue()); platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.OUT.getValue());
return platElderRealTimeNowVO; return platElderRealTimeNowVO;
} }
...@@ -393,6 +397,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService { ...@@ -393,6 +397,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
double y = StandardDeviationUtil.variance(doubleArrY); double y = StandardDeviationUtil.variance(doubleArrY);
boolean yFlag = new BigDecimal(y + "").compareTo(new BigDecimal(2)) > 0; boolean yFlag = new BigDecimal(y + "").compareTo(new BigDecimal(2)) > 0;
if (xFlag && yFlag) { if (xFlag && yFlag) {
log.info("当前属于离床运动：" + platElderIdDTO.getElderId());
platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.RUN.getValue()); platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.RUN.getValue());
return platElderRealTimeNowVO; return platElderRealTimeNowVO;
} else { } else {
...@@ -424,6 +429,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService { ...@@ -424,6 +429,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
boolean noPersonFlag = voList.stream().allMatch(e -> e.getPersonState() == 0); boolean noPersonFlag = voList.stream().allMatch(e -> e.getPersonState() == 0);
if (noPersonFlag) { if (noPersonFlag) {
log.info("当前属于外出：" + platElderIdDTO.getElderId());
platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.OUT.getValue()); platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.OUT.getValue());
return platElderRealTimeNowVO; return platElderRealTimeNowVO;
} }
...@@ -435,6 +441,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService { ...@@ -435,6 +441,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
double y = StandardDeviationUtil.variance(doubleArrY); double y = StandardDeviationUtil.variance(doubleArrY);
boolean yFlag = new BigDecimal(y + "").compareTo(new BigDecimal(2)) > 0; boolean yFlag = new BigDecimal(y + "").compareTo(new BigDecimal(2)) > 0;
if (xFlag && yFlag) { if (xFlag && yFlag) {
log.info("当前属于离床运动：" + platElderIdDTO.getElderId());
platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.RUN.getValue()); platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.RUN.getValue());
return platElderRealTimeNowVO; return platElderRealTimeNowVO;
} else { } else {
...@@ -442,6 +449,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService { ...@@ -442,6 +449,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
} }
} }
if (!sportFlag) { if (!sportFlag) {
log.info("当前属于离床静息：" + platElderIdDTO.getElderId());
platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.REST.getValue()); platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.REST.getValue());
return platElderRealTimeNowVO; return platElderRealTimeNowVO;
} }
......
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