老人图表

server-module/src/main/java/com/makeit/module/controller/elder/PlatElderReportDayController.java

@@ -43,7 +43,7 @@ public class PlatElderReportDayController {
     @ApiOperation("睡眠图表")
     @PostMapping("sleepDiagram")
     public ApiResponseEntity<List<PlatElderSleepDiagramVO>> sleepDiagram(@RequestBody PlatElderReportDTO platElderIdDTO) {
-        return null;
+        return ApiResponseUtils.success(platElderDayReportDayService.sleepDiagram(platElderIdDTO));
     }
 
     @ApiOperation("心率呼吸评价")

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

 package com.makeit.service.platform.elder.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.makeit.dto.platform.elder.PlatElderIdDTO;
 import com.makeit.dto.platform.elder.PlatElderReportDTO;
 import com.makeit.entity.platform.device.PlatDevice;
+import com.makeit.entity.platform.elder.PlatElderSleep;
 import com.makeit.entity.platform.elder.PlatElderSleepAnalysis;
 import com.makeit.module.iot.service.IotProductDeviceService;
 import com.makeit.module.iot.vo.breathe.DeviceInfoContentBreathe;
@@ -13,10 +13,10 @@ import com.makeit.service.platform.elder.*;
 import com.makeit.utils.LongTimestampUtil;
 import com.makeit.utils.data.convert.StreamUtil;
 import com.makeit.utils.data.validate.CollectionUtils;
-import com.makeit.utils.old.StringUtils;
 import com.makeit.utils.time.LocalDateTimeUtils;
 import com.makeit.vo.platform.elder.realtime.PlatElderCoordinateVO;
 import com.makeit.vo.platform.elder.realtime.PlatElderRealTimeHeartRespiratoryVO;
+import com.makeit.vo.platform.elder.report.day.PlatElderSleepDiagramContentVO;
 import com.makeit.vo.platform.elder.report.day.PlatElderSleepDiagramVO;
 import com.makeit.vo.platform.elder.report.day.PlatElderSleepEvaluationVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +28,6 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
@@ -108,6 +107,35 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
 
         List<PlatElderSleepDiagramVO> voList = new ArrayList<>(10);
 
+        String nowString = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(now);
+
+        List<PlatElderSleep> sleepList = platElderSleepService.list(new QueryWrapper<PlatElderSleep>().lambda()
+                .eq(PlatElderSleep::getElderId, platElderIdDTO.getElderId())
+                .eq(PlatElderSleep::getCurrentDate, nowString)
+                .orderByAsc(PlatElderSleep::getStartSleep)
+        );
+
+        voList = StreamUtil.map(sleepList, e -> {
+            PlatElderSleepDiagramVO vo = new PlatElderSleepDiagramVO();
+            vo.setSleepAt(e.getStartSleep());
+            vo.setWakeUpAt(e.getEndSleep());
+
+            List<PlatElderSleepDiagramContentVO> contentList = StreamUtil.map(e.getSleepRecord(), i -> {
+                PlatElderSleepDiagramContentVO contentVO = new PlatElderSleepDiagramContentVO();
+
+                contentVO.setStartTime(i.getStartTime());
+                contentVO.setEndTime(i.getEndTime());
+                contentVO.setSleepType(i.getSleepType());
+
+                return contentVO;
+
+            });
+
+            vo.setContentList(contentList);
+
+            return vo;
+        });
+
         return voList;
     }
 

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

@@ -9,17 +9,28 @@ import java.time.LocalDateTime;
 @Data
 public class PlatElderSleepDiagramContentVO {
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-    @ApiModelProperty("时间")
-    private LocalDateTime time;
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+//    @ApiModelProperty("时间")
+//    private LocalDateTime time;
+//
+//    @ApiModelProperty(value = "深度睡眠得分")
+//    private String sleepDeepScore;
+//
+//    @ApiModelProperty(value = "浅度睡眠得分")
+//    private String sleepLightnessScore;
+//
+//    @ApiModelProperty(value = "清醒得分")
+//    private String soberScore;
 
-    @ApiModelProperty(value = "深度睡眠得分")
-    private String sleepDeepScore;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @ApiModelProperty("开始时间")
+    private String startTime;
 
-    @ApiModelProperty(value = "浅度睡眠得分")
-    private String sleepLightnessScore;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @ApiModelProperty("结束时间")
+    private String endTime;
 
-    @ApiModelProperty(value = "清醒得分")
-    private String soberScore;
+    @ApiModelProperty(value = "类型")
+    private String sleepType;
 
 }