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

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

@@ -329,11 +329,13 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
             if (StringUtils.equals(person,"1")) {
                 // 在床运动
                 if (StringUtils.equals(personState,"1")) {
+                    log.info("当前属于在床运动：" + platElderIdDTO.getElderId());
                     platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.SPORT.getValue());
                     return platElderRealTimeNowVO;
                 }
                 // 在床静息
                 if (StringUtils.equals(personState,"2") || StringUtils.equals(personState,"2")) {
+                    log.info("当前属于在床静息：" + platElderIdDTO.getElderId());
                     platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.BED.getValue());
                     return platElderRealTimeNowVO;
                 }
@@ -348,6 +350,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
                 };
                 boolean sleepFlag = values.stream().allMatch(predicate);
                 if (sleepFlag) {
+                    log.info("当前属于在床睡眠：" + platElderIdDTO.getElderId());
                     platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.SLEEP.getValue());
                     return platElderRealTimeNowVO;
                 }
@@ -381,6 +384,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
 
             boolean noPersonFlag = voList.stream().allMatch(e -> e.getPersonState() == 0);
             if (noPersonFlag) {
+                log.info("当前属于外出：" + platElderIdDTO.getElderId());
                 platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.OUT.getValue());
                 return platElderRealTimeNowVO;
             }
@@ -393,6 +397,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
             double y = StandardDeviationUtil.variance(doubleArrY);
             boolean yFlag = new BigDecimal(y + "").compareTo(new BigDecimal(2)) > 0;
             if (xFlag && yFlag) {
+                log.info("当前属于离床运动：" + platElderIdDTO.getElderId());
                 platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.RUN.getValue());
                 return platElderRealTimeNowVO;
             } else {
@@ -424,6 +429,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
 
             boolean noPersonFlag = voList.stream().allMatch(e -> e.getPersonState() == 0);
             if (noPersonFlag) {
+                log.info("当前属于外出：" + platElderIdDTO.getElderId());
                 platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.OUT.getValue());
                 return platElderRealTimeNowVO;
             }
@@ -435,6 +441,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
             double y = StandardDeviationUtil.variance(doubleArrY);
             boolean yFlag = new BigDecimal(y + "").compareTo(new BigDecimal(2)) > 0;
             if (xFlag && yFlag) {
+                log.info("当前属于离床运动：" + platElderIdDTO.getElderId());
                 platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.RUN.getValue());
                 return platElderRealTimeNowVO;
             } else {
@@ -442,6 +449,7 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
             }
         }
         if (!sportFlag) {
+            log.info("当前属于离床静息：" + platElderIdDTO.getElderId());
             platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.REST.getValue());
             return platElderRealTimeNowVO;
         }