Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit ef1ed997 by huangjy
Options

fix：睡眠分析问题

parent d499ebf8
Inline Side-by-side
Showing with 16 additions and 8 deletions
server-service/src/main/java/com/makeit/entity/platform/elder/PlatElderSleep.java
...@@ -42,6 +42,8 @@ public class PlatElderSleep extends BaseBusEntity { ...@@ -42,6 +42,8 @@ public class PlatElderSleep extends BaseBusEntity {
private Integer elderSleepType; private Integer elderSleepType;
@ApiModelProperty(value = "当前日期 yyyy-mm-dd") @ApiModelProperty(value = "当前日期 yyyy-mm-dd")
private String happenDate; private String happenDate;
@ApiModelProperty(value = "间隔时间")
private Long interval;
@ApiModelProperty(value = "睡眠记录 区分时间段记录 [{\"sleepType\":\"\",\"startTime\":\"\",\"endTime\":\"\"},{}]") @ApiModelProperty(value = "睡眠记录 区分时间段记录 [{\"sleepType\":\"\",\"startTime\":\"\",\"endTime\":\"\"},{}]")
@TableField(typeHandler = ElderListStringJsonTypeHandler.class) @TableField(typeHandler = ElderListStringJsonTypeHandler.class)
......
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderSleepServiceImpl.java
...@@ -599,7 +599,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper, ...@@ -599,7 +599,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
platElderBreatheAnalysis.setHappenDate(currentDate); platElderBreatheAnalysis.setHappenDate(currentDate);
platElderBreatheAnalysis.setTenantId(tenantId); platElderBreatheAnalysis.setTenantId(tenantId);
platElderBreatheAnalysis.setBreatheEvaluate(diseaseReport == null ? "" : diseaseReport.getEvaluate()); platElderBreatheAnalysis.setBreatheEvaluate(diseaseReport == null ? "" : diseaseReport.getEvaluate());
//platElderBreatheAnalysisService.save(platElderBreatheAnalysis); platElderBreatheAnalysisService.save(platElderBreatheAnalysis);
// 记录长者呼吸心率的异常事件 // 记录长者呼吸心率的异常事件
List<PlatElderBreatheAbnormal> platElderBreatheAbnormalList = Lists.newArrayList(); List<PlatElderBreatheAbnormal> platElderBreatheAbnormalList = Lists.newArrayList();
...@@ -614,7 +614,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper, ...@@ -614,7 +614,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
platElderBreatheAbnormal.setTenantId(tenantId); platElderBreatheAbnormal.setTenantId(tenantId);
platElderBreatheAbnormalList.add(platElderBreatheAbnormal); platElderBreatheAbnormalList.add(platElderBreatheAbnormal);
} }
//platElderBreatheAbnormalService.saveBatch(platElderBreatheAbnormalList); platElderBreatheAbnormalService.saveBatch(platElderBreatheAbnormalList);
int totalActionCount = 0; int totalActionCount = 0;
...@@ -802,13 +802,11 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper, ...@@ -802,13 +802,11 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
if (StringUtils.isEmpty(startAwakeTime) && awakeMinute == 0) { if (StringUtils.isEmpty(startAwakeTime) && awakeMinute == 0) {
continue; continue;
} }
if (awakeMinute > sleepDeepActionTimeBegin) {
sleepTimeAnalysisVO = new SleepTimeAnalysisVO(); sleepTimeAnalysisVO = new SleepTimeAnalysisVO();
sleepTimeAnalysisVO.setStartTime(startAwakeTime); sleepTimeAnalysisVO.setStartTime(startAwakeTime);
sleepTimeAnalysisVO.setEndTime(entry.getKey()); sleepTimeAnalysisVO.setEndTime(entry.getKey());
sleepTimeAnalysisVO.setType(SleepTypeEnum.SOBER.getCode()); sleepTimeAnalysisVO.setType(SleepTypeEnum.SOBER.getCode());
sleepTimeAnalysisVOList.add(sleepTimeAnalysisVO); sleepTimeAnalysisVOList.add(sleepTimeAnalysisVO);
}
startAwakeTime = null; startAwakeTime = null;
awakeMinute = 0; awakeMinute = 0;
} }
...@@ -932,6 +930,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper, ...@@ -932,6 +930,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
} else { } else {
elderSleep.setElderSleepType(ElderSleepType.REST.getCode()); elderSleep.setElderSleepType(ElderSleepType.REST.getCode());
} }
elderSleep.setInterval(timeAnalysisVO.getInterval());
elderSleep.setSleepRecord(sleepRangeVOList); elderSleep.setSleepRecord(sleepRangeVOList);
elderSleepList.add(elderSleep); elderSleepList.add(elderSleep);
} }
...@@ -1028,10 +1027,19 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper, ...@@ -1028,10 +1027,19 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
// 记录长者一天睡眠的记录 // 记录长者一天睡眠的记录
long daySleepTime = 0;
long dayRestTime = 0;
for (PlatElderSleep elderSleep : elderSleepList) { for (PlatElderSleep elderSleep : elderSleepList) {
elderSleep.setElderId(elder.getId()); elderSleep.setElderId(elder.getId());
elderSleep.setHappenDate(currentDate); elderSleep.setHappenDate(currentDate);
elderSleep.setTenantId(tenantId); elderSleep.setTenantId(tenantId);
if (ElderSleepType.SLEEP.getCode() == elderSleep.getElderSleepType()) {
daySleepTime += elderSleep.getInterval();
}
if (ElderSleepType.REST.getCode() == elderSleep.getElderSleepType()) {
dayRestTime += elderSleep.getInterval();
}
} }
// TODO 起床时间和入睡时间 // TODO 起床时间和入睡时间
platElderSleepService.saveBatch(elderSleepList); platElderSleepService.saveBatch(elderSleepList);
...@@ -1045,10 +1053,8 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper, ...@@ -1045,10 +1053,8 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
elderSleepAnalysis.setTurnedCount(totalTurnedCount); elderSleepAnalysis.setTurnedCount(totalTurnedCount);
elderSleepAnalysis.setHappenDate(currentDate); elderSleepAnalysis.setHappenDate(currentDate);
elderSleepAnalysis.setSleepScore(String.valueOf(totalScore)); elderSleepAnalysis.setSleepScore(String.valueOf(totalScore));
elderSleepAnalysis.setSleepTime(String.valueOf(sleepTime)); elderSleepAnalysis.setSleepTime(String.valueOf(daySleepTime));
int minuteDay = 24 * 60; elderSleepAnalysis.setRestTime(String.valueOf(dayRestTime));
// TODO 休息时间 先用一天时间 - 睡觉时间
elderSleepAnalysis.setRestTime(String.valueOf(minuteDay - sleepTime));
elderSleepAnalysis.setSleepResult(sleepReport.getResult()); elderSleepAnalysis.setSleepResult(sleepReport.getResult());
elderSleepAnalysis.setTenantId(tenantId); elderSleepAnalysis.setTenantId(tenantId);
elderSleepAnalysis.setSleepEvaluate(elderReport == null ? "" : elderReport.getEvaluate()); elderSleepAnalysis.setSleepEvaluate(elderReport == null ? "" : elderReport.getEvaluate());
......
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