fix:睡眠时间计算代码优化

server-common/src/main/java/com/makeit/module/iot/vo/analysis/SleepCountDTO.java

+package com.makeit.module.iot.vo.analysis;
+
+import lombok.Data;
+
+/**
+ * @author wangzy
+ * @description
+ * @createDate 2024-01-04-16:18
+ */
+@Data
+public class SleepCountDTO {
+
+    private Integer totalActionCount;
+
+    private Integer totalTurnedCount;
+}

server-common/src/main/java/com/makeit/module/iot/vo/analysis/SleepTimeAnalysisVO.java

@@ -11,19 +11,25 @@ public class SleepTimeAnalysisVO {
 
 
     private String endTime;
     private String endTime;
 
 
-    // 间隔时间
+    /**
+     *  间隔时间(分钟）
+     */
     private Long interval;
     private Long interval;
 
 
-    // SleepTypeEnum
+    /**
+     * SleepTypeEnum
+     */
     private String type;
     private String type;
 
 
     private List<SleepTimeAnalysisVO> deepList;
     private List<SleepTimeAnalysisVO> deepList;
     private List<SleepTimeAnalysisVO> midList;
     private List<SleepTimeAnalysisVO> midList;
+    /**
+     * 浅睡
+     */
     private List<SleepTimeAnalysisVO> lightList;
     private List<SleepTimeAnalysisVO> lightList;
+    /**
+     * 清醒
+     */
     private List<SleepTimeAnalysisVO> soberList;
     private List<SleepTimeAnalysisVO> soberList;
 
 
-
-
-
-
 }
 }

server-common/src/main/java/com/makeit/module/iot/vo/analysis/SleepTimeDTO.java

+package com.makeit.module.iot.vo.analysis;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author wangzy
+ * @description
+ * @createDate 2024-01-04-11:13
+ */
+@Data
+public class SleepTimeDTO {
+
+
+    /**
+     * 入睡
+     */
+    private List<SleepTimeAnalysisVO> sleepList;
+
+    /**
+     * 深度
+     */
+    private List<SleepTimeAnalysisVO> deepList;
+    /**
+     * 中度睡眠
+     */
+    private List<SleepTimeAnalysisVO> midList;
+    /**
+     * 浅睡
+     */
+    private List<SleepTimeAnalysisVO> lightList;
+    /**
+     * 清醒
+     */
+    private List<SleepTimeAnalysisVO> soberList;
+
+    /**
+     * 起床
+     */
+    private List<SleepTimeAnalysisVO> getUpList;
+
+    /**
+     * 小憩
+     */
+    private List<SleepTimeAnalysisVO> restList;
+
+
+    /**
+     * 睡眠：深度睡眠和浅度睡眠>3小时
+     */
+    private List<SleepTimeAnalysisVO> daySleepList;
+}

server-common/src/main/java/com/makeit/module/iot/vo/analysis/SleepTimeMinuteDTO.java

+package com.makeit.module.iot.vo.analysis;
+
+import lombok.Data;
+
+/**
+ * @author wangzy
+ * @description
+ * @createDate 2024-01-04-14:28
+ */
+@Data
+public class SleepTimeMinuteDTO {
+
+    private Long daySleepTime;
+
+    private Long dayRestTime;
+
+    private Long deepTime;
+
+    private Long soberTime;
+
+    private Long lightTime;
+
+}

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.dto.wechat.device.PlatDeviceAttrWechatDTO;
 import com.makeit.dto.wechat.device.PlatDeviceAttrWechatDTO;
+import com.makeit.entity.platform.elder.ElderSleepAnalysisVO;
 import com.makeit.entity.platform.elder.PlatElderBreatheAnalysis;
 import com.makeit.entity.platform.elder.PlatElderBreatheAnalysis;
 import com.makeit.entity.platform.elder.PlatElderSleepAnalysis;
 import com.makeit.entity.platform.elder.PlatElderSleepAnalysis;
 import com.makeit.external.huineng.HuiNengService;
 import com.makeit.external.huineng.HuiNengService;
@@ -83,8 +84,8 @@ public class PlatElderSleepController {
     @GetMapping("test4")
     @GetMapping("test4")
     @AuthIgnore
     @AuthIgnore
     @TenantIdIgnore
     @TenantIdIgnore
-    public ApiResponseEntity<List<PlatElderSleepAnalysis>> elderSleepSleepAnalysisTask(@RequestParam Integer month,
-                                                                                       @RequestParam Integer day) {
+    public ApiResponseEntity<List<ElderSleepAnalysisVO>> elderSleepSleepAnalysisTask(@RequestParam Integer month,
+                                                                                     @RequestParam Integer day) {
         return ApiResponseUtils.success(platElderSleepService.elderSleepSleepAnalysisTask(month, day));
         return ApiResponseUtils.success(platElderSleepService.elderSleepSleepAnalysisTask(month, day));
     }
     }
 
 

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

+package com.makeit.entity.platform.elder;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author wangzy
+ * @description
+ * @createDate 2024-01-04-15:49
+ */
+@Data
+public class ElderSleepAnalysisVO extends PlatElderSleepAnalysis {
+
+    @TableField(exist = false)
+    List<PlatElderSleep> platElderSleeps;
+}

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

@@ -38,7 +38,7 @@ public class PlatElderSleep extends BaseBusEntity {
     @ApiModelProperty(value = "起床时间")
     @ApiModelProperty(value = "起床时间")
     private LocalDateTime endSleep;
     private LocalDateTime endSleep;
 
 
-    @ApiModelProperty(value = "睡眠类型 1 睡眠 2 小憩")
+    @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;

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

 package com.makeit.service.platform.elder;
 package com.makeit.service.platform.elder;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.makeit.entity.platform.elder.ElderSleepAnalysisVO;
 import com.makeit.entity.platform.elder.PlatElderSleep;
 import com.makeit.entity.platform.elder.PlatElderSleep;
-import com.makeit.entity.platform.elder.PlatElderSleepAnalysis;
 import com.makeit.entity.saas.analysis.SaasSleepEvaluateStandardReport;
 import com.makeit.entity.saas.analysis.SaasSleepEvaluateStandardReport;
 
 
 import java.util.List;
 import java.util.List;
@@ -17,7 +17,7 @@ import java.util.List;
  */
  */
 public interface PlatElderSleepService extends IService<PlatElderSleep> {
 public interface PlatElderSleepService extends IService<PlatElderSleep> {
 
 
-    List<PlatElderSleepAnalysis> elderSleepSleepAnalysisTask(Integer month, Integer day);
+    List<ElderSleepAnalysisVO> elderSleepSleepAnalysisTask(Integer month, Integer day);
 
 
     void test1();
     void test1();