小时字段

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

@@ -101,6 +101,9 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
         platElderSleepEvaluationVO.setSleepDuration(Integer.valueOf(platElderSleepAnalysis.getSleepTime() + ""));
         platElderSleepEvaluationVO.setSleepDuration(Integer.valueOf(platElderSleepAnalysis.getSleepTime() + ""));
         platElderSleepEvaluationVO.setRestDuration(Integer.valueOf(platElderSleepAnalysis.getRestTime() + ""));
         platElderSleepEvaluationVO.setRestDuration(Integer.valueOf(platElderSleepAnalysis.getRestTime() + ""));
 
 
+        platElderSleepEvaluationVO.setSleepDurationHour(new BigDecimal(platElderSleepEvaluationVO.getSleepDuration()).divide(new BigDecimal(60), 2, BigDecimal.ROUND_HALF_UP));
+        platElderSleepEvaluationVO.setRestDurationHour(new BigDecimal(platElderSleepEvaluationVO.getRestDuration()).divide(new BigDecimal(60), 2, BigDecimal.ROUND_HALF_UP));
+
         return platElderSleepEvaluationVO;
         return platElderSleepEvaluationVO;
 
 
     }
     }

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

@@ -29,6 +29,7 @@ import com.makeit.vo.platform.elder.report.week.PlatElderSleepDiagramWeekVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.math.BigDecimal;
 import java.time.DayOfWeek;
 import java.time.DayOfWeek;
 import java.time.Duration;
 import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDate;
@@ -262,20 +263,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
 
 
             List<PlatSleepRangeVO> sleepRecord = list.stream().flatMap(i -> i.getSleepRecord().stream()).collect(Collectors.toList());
             List<PlatSleepRangeVO> sleepRecord = list.stream().flatMap(i -> i.getSleepRecord().stream()).collect(Collectors.toList());
 
 
-            vo.setSleepDeepDuration(sleepRecord.stream().filter(i -> SleepTypeEnum.SLEEP_DEEP.getCode().equals(i.getSleepType())).map(i -> duration(timeFormatter, i.getStartTime(), i.getEndTime())).reduce(0L, Long::sum).intValue());
-            vo.setSleepModerateDuration(sleepRecord.stream().filter(i -> SleepTypeEnum.SLEEP_MODERATE.getCode().equals(i.getSleepType())).map(i -> duration(timeFormatter, i.getStartTime(), i.getEndTime())).reduce(0L, Long::sum).intValue());
-            vo.setSleepLightnessDuration(sleepRecord.stream().filter(i -> SleepTypeEnum.SLEEP_LIGHTNESS.getCode().equals(i.getSleepType())).map(i -> duration(timeFormatter, i.getStartTime(), i.getEndTime())).reduce(0L, Long::sum).intValue());
-            vo.setSoberDuration(sleepRecord.stream().filter(i -> SleepTypeEnum.SOBER.getCode().equals(i.getSleepType())).map(i -> duration(timeFormatter, i.getStartTime(), i.getEndTime())).reduce(0L, Long::sum).intValue());
-
-            PlatElderSleepAnalysis platElderSleepAnalysis = sleepAnalysisMap.get(dateTimeFormatter.format(e));
-
-            if (platElderSleepAnalysis != null) {
-                vo.setTurnedCount(platElderSleepAnalysis.getTurnedCount());
-                vo.setBodyMoveCount(platElderSleepAnalysis.getActionCount());
-                vo.setScore(Integer.valueOf(platElderSleepAnalysis.getSleepScore() + ""));
-            }
-
-            return vo;
+            return getPlatElderSleepDiagramWeekContentVO(dateTimeFormatter, sleepAnalysisMap, timeFormatter, e, vo, sleepRecord);
 
 
         });
         });
 
 
@@ -287,11 +275,28 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
 
 
             List<PlatSleepRangeVO> sleepRecord = list.stream().flatMap(i -> Optional.ofNullable(i.getSleepRecord()).orElse(new ArrayList<>(10)).stream()).collect(Collectors.toList());
             List<PlatSleepRangeVO> sleepRecord = list.stream().flatMap(i -> Optional.ofNullable(i.getSleepRecord()).orElse(new ArrayList<>(10)).stream()).collect(Collectors.toList());
 
 
+            return getPlatElderSleepDiagramWeekContentVO(dateTimeFormatter, sleepAnalysisMap, timeFormatter, e, vo, sleepRecord);
+
+        });
+
+        PlatElderSleepDiagramWeekVO vo = new PlatElderSleepDiagramWeekVO();
+        vo.setSleep(sleep);
+        vo.setRest(rest);
+
+        return vo;
+    }
+
+    private PlatElderSleepDiagramWeekContentVO getPlatElderSleepDiagramWeekContentVO(DateTimeFormatter dateTimeFormatter, Map<String, PlatElderSleepAnalysis> sleepAnalysisMap, DateTimeFormatter timeFormatter, LocalDate e, PlatElderSleepDiagramWeekContentVO vo, List<PlatSleepRangeVO> sleepRecord) {
         vo.setSleepDeepDuration(sleepRecord.stream().filter(i -> SleepTypeEnum.SLEEP_DEEP.getCode().equals(i.getSleepType())).map(i -> duration(timeFormatter, i.getStartTime(), i.getEndTime())).reduce(0L, Long::sum).intValue());
         vo.setSleepDeepDuration(sleepRecord.stream().filter(i -> SleepTypeEnum.SLEEP_DEEP.getCode().equals(i.getSleepType())).map(i -> duration(timeFormatter, i.getStartTime(), i.getEndTime())).reduce(0L, Long::sum).intValue());
         vo.setSleepModerateDuration(sleepRecord.stream().filter(i -> SleepTypeEnum.SLEEP_MODERATE.getCode().equals(i.getSleepType())).map(i -> duration(timeFormatter, i.getStartTime(), i.getEndTime())).reduce(0L, Long::sum).intValue());
         vo.setSleepModerateDuration(sleepRecord.stream().filter(i -> SleepTypeEnum.SLEEP_MODERATE.getCode().equals(i.getSleepType())).map(i -> duration(timeFormatter, i.getStartTime(), i.getEndTime())).reduce(0L, Long::sum).intValue());
         vo.setSleepLightnessDuration(sleepRecord.stream().filter(i -> SleepTypeEnum.SLEEP_LIGHTNESS.getCode().equals(i.getSleepType())).map(i -> duration(timeFormatter, i.getStartTime(), i.getEndTime())).reduce(0L, Long::sum).intValue());
         vo.setSleepLightnessDuration(sleepRecord.stream().filter(i -> SleepTypeEnum.SLEEP_LIGHTNESS.getCode().equals(i.getSleepType())).map(i -> duration(timeFormatter, i.getStartTime(), i.getEndTime())).reduce(0L, Long::sum).intValue());
         vo.setSoberDuration(sleepRecord.stream().filter(i -> SleepTypeEnum.SOBER.getCode().equals(i.getSleepType())).map(i -> duration(timeFormatter, i.getStartTime(), i.getEndTime())).reduce(0L, Long::sum).intValue());
         vo.setSoberDuration(sleepRecord.stream().filter(i -> SleepTypeEnum.SOBER.getCode().equals(i.getSleepType())).map(i -> duration(timeFormatter, i.getStartTime(), i.getEndTime())).reduce(0L, Long::sum).intValue());
 
 
+        vo.setSleepDeepDurationHour(new BigDecimal(vo.getSleepDeepDuration()).divide(new BigDecimal(60), 2, BigDecimal.ROUND_HALF_UP));
+        vo.setSleepModerateDurationHour(new BigDecimal(vo.getSleepModerateDuration()).divide(new BigDecimal(60), 2, BigDecimal.ROUND_HALF_UP));
+        vo.setSleepLightnessDurationHour(new BigDecimal(vo.getSleepLightnessDuration()).divide(new BigDecimal(60), 2, BigDecimal.ROUND_HALF_UP));
+        vo.setSoberDurationHour(new BigDecimal(vo.getSoberDuration()).divide(new BigDecimal(60), 2, BigDecimal.ROUND_HALF_UP));
+
         PlatElderSleepAnalysis platElderSleepAnalysis = sleepAnalysisMap.get(dateTimeFormatter.format(e));
         PlatElderSleepAnalysis platElderSleepAnalysis = sleepAnalysisMap.get(dateTimeFormatter.format(e));
 
 
         if (platElderSleepAnalysis != null) {
         if (platElderSleepAnalysis != null) {
@@ -301,14 +306,6 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
         }
         }
 
 
         return vo;
         return vo;
-
-        });
-
-        PlatElderSleepDiagramWeekVO vo = new PlatElderSleepDiagramWeekVO();
-        vo.setSleep(sleep);
-        vo.setRest(rest);
-
-        return vo;
     }
     }
 
 
     @Override
     @Override

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

@@ -3,6 +3,8 @@ package com.makeit.vo.platform.elder.report.day;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.math.BigDecimal;
+
 @Data
 @Data
 public class PlatElderSleepEvaluationVO {
 public class PlatElderSleepEvaluationVO {
 
 
@@ -22,4 +24,12 @@ public class PlatElderSleepEvaluationVO {
     private Integer restDuration;
     private Integer restDuration;
 
 
 
 
+    @ApiModelProperty(value = "睡眠时长")
+    private BigDecimal sleepDurationHour;
+
+    @ApiModelProperty(value = "休息时长")
+    private BigDecimal restDurationHour;
+
+
+
 }
 }

server-service/src/main/java/com/makeit/vo/platform/elder/report/week/PlatElderSleepDiagramWeekContentVO.java

@@ -3,6 +3,7 @@ package com.makeit.vo.platform.elder.report.week;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
 
 
 @Data
 @Data
@@ -23,6 +24,7 @@ public class PlatElderSleepDiagramWeekContentVO {
     @ApiModelProperty(value = "清醒时长")
     @ApiModelProperty(value = "清醒时长")
     private Integer soberDuration;
     private Integer soberDuration;
 
 
+
     @ApiModelProperty(value = "翻身次数")
     @ApiModelProperty(value = "翻身次数")
     private Integer turnedCount;
     private Integer turnedCount;
 
 
@@ -33,5 +35,17 @@ public class PlatElderSleepDiagramWeekContentVO {
     private Integer score;
     private Integer score;
 
 
 
 
+    @ApiModelProperty(value = "深度睡眠时长")
+    private BigDecimal sleepDeepDurationHour;
+
+    @ApiModelProperty(value = "中度睡眠时长")
+    private BigDecimal sleepModerateDurationHour;
+
+    @ApiModelProperty(value = "浅度睡眠时长")
+    private BigDecimal sleepLightnessDurationHour;
+
+    @ApiModelProperty(value = "清醒时长")
+    private BigDecimal soberDurationHour;
+
 
 
 }
 }