fix:bug 修改

server-service/src/main/java/com/makeit/entity/platform/elder/PlatElderSleep.java

@@ -35,10 +35,13 @@ public class PlatElderSleep extends BaseBusEntity {
     @ApiModelProperty(value = "入睡时间")
     @ApiModelProperty(value = "入睡时间")
     private LocalDateTime startSleep;
     private LocalDateTime startSleep;
 
 
+    /**
+     * 入睡结束时间
+     */
     @ApiModelProperty(value = "起床时间")
     @ApiModelProperty(value = "起床时间")
     private LocalDateTime endSleep;
     private LocalDateTime endSleep;
 
 
-    @ApiModelProperty(value = "睡眠类型 1 睡眠 2 小憩,3:深度睡眠，4：中度睡眠，5：浅度睡眠, 6:清醒,7:离床")
+    @ApiModelProperty(value = "睡眠类型 1 睡眠 2 小憩,3:深度睡眠，4：中度睡眠，5：浅度睡眠, 6:清醒,7:起床")
     private Integer elderSleepType;
     private Integer elderSleepType;
     @ApiModelProperty(value = "当前日期 yyyy-mm-dd")
     @ApiModelProperty(value = "当前日期 yyyy-mm-dd")
     private String happenDate;
     private String happenDate;
@@ -50,5 +53,9 @@ public class PlatElderSleep extends BaseBusEntity {
     @TableField(typeHandler = ElderListStringJsonTypeHandler.class)
     @TableField(typeHandler = ElderListStringJsonTypeHandler.class)
     private List<PlatSleepRangeVO> sleepRecord;
     private List<PlatSleepRangeVO> sleepRecord;
 
 
+    @ApiModelProperty(value = "起床时间")
+    @TableField(exist = false)
+    private LocalDateTime wakeUpTime;
+
 
 
 }
 }

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

@@ -102,21 +102,11 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
     @Override
     @Override
     public PlatElderSleepEvaluationVO sleepEvaluation(PlatElderReportDTO platElderIdDTO) {
     public PlatElderSleepEvaluationVO sleepEvaluation(PlatElderReportDTO platElderIdDTO) {
         LocalDate now = Optional.ofNullable(platElderIdDTO.getNow()).orElse(LocalDate.now());
         LocalDate now = Optional.ofNullable(platElderIdDTO.getNow()).orElse(LocalDate.now());
-
         PlatElderSleepEvaluationVO platElderSleepEvaluationVO = new PlatElderSleepEvaluationVO();
         PlatElderSleepEvaluationVO platElderSleepEvaluationVO = new PlatElderSleepEvaluationVO();
-
         String nowString = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(now);
         String nowString = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(now);
-
         String elderId = platElderIdDTO.getElderId();
         String elderId = platElderIdDTO.getElderId();
         String deviceId = platElderIdDTO.getDeviceId();
         String deviceId = platElderIdDTO.getDeviceId();
         String tenantId = platElderIdDTO.getTenantId();
         String tenantId = platElderIdDTO.getTenantId();
-        // if (StringUtils.isNotEmpty(deviceId)) {
-        //     PlatElder platElder = platElderService.getByDeviceId(deviceId,platElderIdDTO.getTenantId());
-        //     if (platElder != null) {
-        //         elderId = platElder.getId();
-        //     }
-        // }
-
 
 
         PlatElderSleepAnalysis platElderSleepAnalysis = platElderSleepAnalysisService.getOne(new QueryWrapper<PlatElderSleepAnalysis>().lambda()
         PlatElderSleepAnalysis platElderSleepAnalysis = platElderSleepAnalysisService.getOne(new QueryWrapper<PlatElderSleepAnalysis>().lambda()
                 .eq(StrUtil.isNotBlank(elderId), PlatElderSleepAnalysis::getElderId, elderId)
                 .eq(StrUtil.isNotBlank(elderId), PlatElderSleepAnalysis::getElderId, elderId)
@@ -199,7 +189,6 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
     @Override
     @Override
     public List<PlatElderSleepDiagramVO> sleepDiagram(PlatElderReportDTO platElderIdDTO) {
     public List<PlatElderSleepDiagramVO> sleepDiagram(PlatElderReportDTO platElderIdDTO) {
         LocalDate now = Optional.ofNullable(platElderIdDTO.getNow()).orElse(LocalDate.now());
         LocalDate now = Optional.ofNullable(platElderIdDTO.getNow()).orElse(LocalDate.now());
-
         List<PlatElderSleepDiagramVO> voList;
         List<PlatElderSleepDiagramVO> voList;
 
 
         String nowString = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(now);
         String nowString = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(now);
@@ -216,31 +205,54 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
                 .orderByAsc(PlatElderSleep::getStartSleep)
                 .orderByAsc(PlatElderSleep::getStartSleep)
         );
         );
 
 
+        setWakeUp(sleepList);
+
         voList = StreamUtil.map(sleepList, e -> {
         voList = StreamUtil.map(sleepList, e -> {
             PlatElderSleepDiagramVO vo = new PlatElderSleepDiagramVO();
             PlatElderSleepDiagramVO vo = new PlatElderSleepDiagramVO();
             vo.setSleepAt(e.getStartSleep());
             vo.setSleepAt(e.getStartSleep());
             vo.setWakeUpAt(e.getEndSleep());
             vo.setWakeUpAt(e.getEndSleep());
+            vo.setNewWakeUpAt(e.getWakeUpTime());
             vo.setElderSleepType(e.getElderSleepType());
             vo.setElderSleepType(e.getElderSleepType());
 
 
             List<PlatElderSleepDiagramContentVO> contentList = StreamUtil.map(Optional.ofNullable(e.getSleepRecord()).orElse(new ArrayList<>(10)), i -> {
             List<PlatElderSleepDiagramContentVO> contentList = StreamUtil.map(Optional.ofNullable(e.getSleepRecord()).orElse(new ArrayList<>(10)), i -> {
                 PlatElderSleepDiagramContentVO contentVO = new PlatElderSleepDiagramContentVO();
                 PlatElderSleepDiagramContentVO contentVO = new PlatElderSleepDiagramContentVO();
-
                 contentVO.setStartTime(i.getStartTime());
                 contentVO.setStartTime(i.getStartTime());
                 contentVO.setEndTime(i.getEndTime());
                 contentVO.setEndTime(i.getEndTime());
                 contentVO.setSleepType(i.getSleepType());
                 contentVO.setSleepType(i.getSleepType());
-
                 return contentVO;
                 return contentVO;
 
 
             });
             });
-
             vo.setContentList(contentList);
             vo.setContentList(contentList);
-
             return vo;
             return vo;
         });
         });
 
 
         return voList;
         return voList;
     }
     }
 
 
+    private void setWakeUp(List<PlatElderSleep> sleepList) {
+        if (CollUtil.isEmpty(sleepList)) {
+            return;
+        }
+        List<PlatElderSleep> sleeps = sleepList.stream().filter(f -> f.getElderSleepType().equals(SleepTypeEnum.SLEEP.getType())).collect(Collectors.toList());
+        if (CollUtil.isEmpty(sleeps)) {
+            return;
+        }
+        List<PlatElderSleep> wakeUpList = sleepList.stream().filter(f -> f.getElderSleepType().equals(SleepTypeEnum.GETUP.getType())).collect(Collectors.toList());
+        sleeps.forEach(s -> {
+            List<PlatElderSleep> wakeList = wakeUpList.stream().filter(f -> s.getStartSleep().isAfter(s.getEndSleep())).collect(Collectors.toList());
+            if (CollUtil.isNotEmpty(wakeList)) {
+                final long[] minute = {24 * 60};
+                wakeList.forEach(w -> {
+                    long between = Duration.between(s.getEndSleep(), w.getStartSleep()).toMinutes();
+                    if (between < minute[0]) {
+                        minute[0] = between;
+                        s.setWakeUpTime(w.getStartSleep());
+                    }
+                });
+            }
+        });
+    }
+
     @Override
     @Override
     public PlatElderHeartRespiratoryEvaluationVO heartRespiratoryEvaluation(PlatElderReportDTO platElderIdDTO) {
     public PlatElderHeartRespiratoryEvaluationVO heartRespiratoryEvaluation(PlatElderReportDTO platElderIdDTO) {
         LocalDate now = Optional.ofNullable(platElderIdDTO.getNow()).orElse(LocalDate.now());
         LocalDate now = Optional.ofNullable(platElderIdDTO.getNow()).orElse(LocalDate.now());
@@ -547,7 +559,9 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
             }
             }
         }
         }
         List<PlatElderBehaviorDistributionVO> voList = new ArrayList<>(10);
         List<PlatElderBehaviorDistributionVO> voList = new ArrayList<>(10);
-
+        if (StrUtil.isBlank(elderId)) {
+            return voList;
+        }
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyyMMdd");
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyyMMdd");
 
 
         List<PlatElderBehaviorDistributionVO> finalVoList = voList;
         List<PlatElderBehaviorDistributionVO> finalVoList = voList;

server-service/src/main/java/com/makeit/vo/platform/elder/report/day/PlatElderSleepDiagramVO.java

@@ -25,5 +25,9 @@ public class PlatElderSleepDiagramVO {
     private Integer elderSleepType;
     private Integer elderSleepType;
 
 
 
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @ApiModelProperty("起床时间")
+    private LocalDateTime newWakeUpAt;
+
 
 
 }
 }