Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 5d403491 by 汪志阳
Options

fix: 睡眠数据丢失

parent 272e1fda
Inline Side-by-side
Showing with 8 additions and 6 deletions
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderSleepServiceImpl.java
...@@ -524,12 +524,13 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper, ...@@ -524,12 +524,13 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
s.setInterval(durationRange); s.setInterval(durationRange);
}); });
Map<String, List<SleepTimeAnalysisVO>> sleepMap = StreamUtil.groupBy(sleepTimeAnalysisVOList, SleepTimeAnalysisVO::getType); Map<String, List<SleepTimeAnalysisVO>> sleepMap = StreamUtil.groupBy(sleepTimeAnalysisVOList, SleepTimeAnalysisVO::getType);
List<SleepTimeAnalysisVO> daySleepList = sleepMap.containsKey(SleepTypeEnum.DAY_SLEEP.getCode()) ? sleepMap.get(SleepTypeEnum.DAY_SLEEP.getCode()) : new ArrayList<>(); List<SleepTimeAnalysisVO> daySleepList = sleepMap.getOrDefault(SleepTypeEnum.DAY_SLEEP.getCode(), new ArrayList<>());
List<SleepTimeAnalysisVO> sleepList = sleepMap.containsKey(SleepTypeEnum.SLEEP.getCode()) ? sleepMap.get(SleepTypeEnum.SLEEP.getCode()) : new ArrayList<>(); List<SleepTimeAnalysisVO> sleepList = sleepMap.getOrDefault(SleepTypeEnum.SLEEP.getCode(), new ArrayList<>());
List<SleepTimeAnalysisVO> deepList = sleepMap.containsKey(SleepTypeEnum.SLEEP_DEEP.getCode()) ? sleepMap.get(SleepTypeEnum.SLEEP_DEEP.getCode()) : new ArrayList<>(); List<SleepTimeAnalysisVO> deepList = sleepMap.getOrDefault(SleepTypeEnum.SLEEP_DEEP.getCode(), new ArrayList<>());
List<SleepTimeAnalysisVO> moderateList = sleepMap.containsKey(SleepTypeEnum.SLEEP_MODERATE.getCode()) ? sleepMap.get(SleepTypeEnum.SLEEP_MODERATE.getCode()) : new ArrayList<>(); List<SleepTimeAnalysisVO> moderateList = sleepMap.getOrDefault(SleepTypeEnum.SLEEP_MODERATE.getCode(), new ArrayList<>());
List<SleepTimeAnalysisVO> getUpList = sleepMap.containsKey(SleepTypeEnum.GETUP.getCode()) ? sleepMap.get(SleepTypeEnum.GETUP.getCode()) : new ArrayList<>(); List<SleepTimeAnalysisVO> getUpList = sleepMap.getOrDefault(SleepTypeEnum.GETUP.getCode(), new ArrayList<>());
List<SleepTimeAnalysisVO> soberList = sleepMap.containsKey(SleepTypeEnum.SOBER.getCode()) ? sleepMap.get(SleepTypeEnum.SOBER.getCode()) : new ArrayList<>(); List<SleepTimeAnalysisVO> soberList = sleepMap.getOrDefault(SleepTypeEnum.SOBER.getCode(), new ArrayList<>());
List<SleepTimeAnalysisVO> restList = sleepMap.getOrDefault(SleepTypeEnum.RESTING.getCode(), new ArrayList<>());
SleepTimeDTO sleepTimeDTO = new SleepTimeDTO(); SleepTimeDTO sleepTimeDTO = new SleepTimeDTO();
sleepTimeDTO.setDeepList(deepList); sleepTimeDTO.setDeepList(deepList);
sleepTimeDTO.setMidList(moderateList); sleepTimeDTO.setMidList(moderateList);
...@@ -537,6 +538,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper, ...@@ -537,6 +538,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
sleepTimeDTO.setSleepList(sleepList); sleepTimeDTO.setSleepList(sleepList);
sleepTimeDTO.setGetUpList(getUpList); sleepTimeDTO.setGetUpList(getUpList);
sleepTimeDTO.setDaySleepList(daySleepList); sleepTimeDTO.setDaySleepList(daySleepList);
sleepTimeDTO.setRestList(restList);
List<SleepTimeAnalysisVO> lightSleepList = new ArrayList<>(); List<SleepTimeAnalysisVO> lightSleepList = new ArrayList<>();
if (CollUtil.isNotEmpty(sleepList)) { if (CollUtil.isNotEmpty(sleepList)) {
lightSleepList = sleepList; lightSleepList = sleepList;
......
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