Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 7e54fc62 by 罗志长
Options

fix：入睡、清醒判断

parent 2ab24c2c
Inline Side-by-side
Showing with 9 additions and 12 deletions
server-module/src/main/java/com/makeit/module/controller/elder/PlatElderSleepController.java
...@@ -90,6 +90,7 @@ public class PlatElderSleepController { ...@@ -90,6 +90,7 @@ public class PlatElderSleepController {
@ApiOperation("测试") @ApiOperation("测试")
@PostMapping("test5") @PostMapping("test5")
@AuthIgnore @AuthIgnore
@TenantIdIgnore
public ApiResponseEntity<Void> coordinateRecordTask() { public ApiResponseEntity<Void> coordinateRecordTask() {
platElderCoordinateRecordService.coordinateRecordTask(); platElderCoordinateRecordService.coordinateRecordTask();
return ApiResponseUtils.success(); return ApiResponseUtils.success();
......
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderSleepServiceImpl.java
...@@ -187,8 +187,8 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper, ...@@ -187,8 +187,8 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
boolean isAction = false; // 每分钟是否动过 boolean isAction = false; // 每分钟是否动过
AnalysisVO analysisVO = new AnalysisVO(); AnalysisVO analysisVO = new AnalysisVO();
int getUpBodymoveCount = 0; int getUpBodymoveCount = 0;
boolean isMoveBed = true; boolean isMoveBed = false;
boolean awakeMinuteActionFlag = true; // 清醒每分钟体动是否满足要求 boolean awakeMinuteActionFlag = false; // 清醒每分钟体动是否满足要求
int noPersonCount = 0; // 无人跳过计数 int noPersonCount = 0; // 无人跳过计数
int sleepDeepMinuteCount = 0; // 深睡每分钟体动和翻身次数 int sleepDeepMinuteCount = 0; // 深睡每分钟体动和翻身次数
...@@ -201,8 +201,9 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper, ...@@ -201,8 +201,9 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
int hr = breatheProperties.getHr(); int hr = breatheProperties.getHr();
Integer hasPerson = breatheProperties.getPerson(); // 0无人，1有人 Integer hasPerson = breatheProperties.getPerson(); // 0无人，1有人
if (breatheProperties.getPerson() == 0) { if (hasPerson == 0) {
noPersonCount++; noPersonCount++;
isMoveBed = true;
continue; continue;
} }
// 0和255直接跳过 // 0和255直接跳过
...@@ -222,7 +223,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper, ...@@ -222,7 +223,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
turnoverCount++; turnoverCount++;
} }
// 判断入睡时间的体动阈值 // 判断入睡时间的体动阈值
if (bodymove > sleepTimeActionThreshold) { if (bodymove >= sleepTimeActionThreshold) {
isAction = true; isAction = true;
} }
// 起床每分钟体动次数 // 起床每分钟体动次数
...@@ -230,15 +231,10 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper, ...@@ -230,15 +231,10 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
getUpBodymoveCount++; getUpBodymoveCount++;
} }
// 清醒 // 清醒
if (bodymove < awakeThreshold || hasPerson == 1) { if (bodymove > awakeThreshold) {
awakeMinuteActionFlag = false; awakeMinuteActionFlag = true;
}
// 判断有没有离开床
if (hasPerson == 1) {
isMoveBed = false;
} }
if (br > maxBr) { if (br > maxBr) {
maxBr = br; maxBr = br;
} }
...@@ -252,7 +248,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper, ...@@ -252,7 +248,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
if (hr < minHr) { if (hr < minHr) {
minHr = hr; minHr = hr;
} }
if (breatheProperties.getPerson() == 1) { if (hasPerson == 1) {
totalBr += br; totalBr += br;
totalHr += hr; totalHr += hr;
hrBrCount++; hrBrCount++;
......
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