Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 78c3bc5a by huangjy
Options

fix: 状态判断新增log

parent c77769cd
Inline Side-by-side
Showing with 10 additions and 3 deletions
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderRealTimeServiceImpl.java
...@@ -284,12 +284,15 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService { ...@@ -284,12 +284,15 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
Double[] doubleArrX = voList.stream().map(e -> e.getX().doubleValue()).toArray(Double[]::new); Double[] doubleArrX = voList.stream().map(e -> e.getX().doubleValue()).toArray(Double[]::new);
double x = StandardDeviationUtil.variance(doubleArrX); double x = StandardDeviationUtil.variance(doubleArrX);
boolean xFlag = new BigDecimal(x + "").compareTo(new BigDecimal(2)) > 0; boolean xFlag = new BigDecimal(x + "").compareTo(new BigDecimal(2)) > 0;
log.info("空间设备算出来X方差为:{},是否大于2：{}，设备id：{}",x,xFlag,device.getOriDeviceId());
Double[] doubleArrY = voList.stream().map(e -> e.getY().doubleValue()).toArray(Double[]::new); Double[] doubleArrY = voList.stream().map(e -> e.getY().doubleValue()).toArray(Double[]::new);
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;
log.info("空间设备算出来Y方差为:{},是否大于2：{}，设备id：{}",y,yFlag,device.getOriDeviceId());
if (xFlag && yFlag) { if (xFlag && yFlag) {
log.info("当前属于离床运动：" + platElderIdDTO.getElderId()); log.info("当前属于空间设备离床运动：" + platElderIdDTO.getElderId());
platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.RUN.getValue()); platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.RUN.getValue());
return platElderRealTimeNowVO; return platElderRealTimeNowVO;
} else { } else {
...@@ -317,19 +320,23 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService { ...@@ -317,19 +320,23 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
boolean noPersonFlag = voList.stream().allMatch(e -> e.getPerson() == 0); boolean noPersonFlag = voList.stream().allMatch(e -> e.getPerson() == 0);
if (noPersonFlag) { if (noPersonFlag) {
log.info("当前属于外出：" + platElderIdDTO.getElderId()); log.info("当前属于跌倒设备外出：" + platElderIdDTO.getElderId());
platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.OUT.getValue()); platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.OUT.getValue());
return platElderRealTimeNowVO; return platElderRealTimeNowVO;
} }
Double[] doubleArrX = voList.stream().map(e -> e.getX().doubleValue()).toArray(Double[]::new); Double[] doubleArrX = voList.stream().map(e -> e.getX().doubleValue()).toArray(Double[]::new);
double x = StandardDeviationUtil.variance(doubleArrX); double x = StandardDeviationUtil.variance(doubleArrX);
boolean xFlag = new BigDecimal(x + "").compareTo(new BigDecimal(2)) > 0; boolean xFlag = new BigDecimal(x + "").compareTo(new BigDecimal(2)) > 0;
log.info("跌倒设备算出来X方差为:{},是否大于2：{},设备id：{}",x,xFlag,device.getOriDeviceId());
Double[] doubleArrY = voList.stream().map(e -> e.getY().doubleValue()).toArray(Double[]::new); Double[] doubleArrY = voList.stream().map(e -> e.getY().doubleValue()).toArray(Double[]::new);
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;
log.info("跌倒设备算出来Y方差为:{},是否大于2：{},设备id：{}",y,yFlag,device.getOriDeviceId());
if (xFlag && yFlag) { if (xFlag && yFlag) {
log.info("当前属于离床运动：" + platElderIdDTO.getElderId()); log.info("当前属于跌倒设备离床运动：" + platElderIdDTO.getElderId());
platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.RUN.getValue()); platElderRealTimeNowVO.setStatus(PlatElderRealtimeReportEnum.NowStatus.RUN.getValue());
return platElderRealTimeNowVO; return platElderRealTimeNowVO;
} else { } else {
......
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