Merge branch 'fix_sleep' into dev

83481083 · 汪志阳 · 1d7be20b · 43732a0c · 83481083 · 83481083
Commit 83481083 authored Jan 02, 2024 by 汪志阳
Showing with 134 additions and 18 deletions
server-module/src/main/java/com/makeit/module/controller/elder/PlatElderSleepController.java
server-service/src/main/java/com/makeit/service/platform/elder/PlatElderBreatheAnalysisService.java
server-service/src/main/java/com/makeit/service/platform/elder/PlatElderSleepService.java
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderBreatheAnalysisServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderSleepServiceImpl.java
server-service/src/main/java/com/makeit/vo/platform/elder/wakeUpAnalysisVO.java
server-web/src/test/java/com/makeit/iotapi/IotDeviceInfoContentFall.java
--- a/server-module/src/main/java/com/makeit/module/controller/elder/PlatElderSleepController.java
+++ b/server-module/src/main/java/com/makeit/module/controller/elder/PlatElderSleepController.java
@@ -12,6 +12,7 @@ import com.makeit.global.annotation.AuthIgnore;
 import com.makeit.global.aspect.tenant.TenantIdIgnore;
 import com.makeit.service.platform.device.PlatDeviceService;
 import com.makeit.service.platform.elder.*;
+import com.makeit.vo.platform.elder.wakeUpAnalysisVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -90,6 +91,7 @@ public class PlatElderSleepController {
    @ApiOperation("测试")
    @PostMapping("test5")
    @AuthIgnore
+    @TenantIdIgnore
    public ApiResponseEntity<Void> coordinateRecordTask() {
        platElderCoordinateRecordService.coordinateRecordTask();
        return ApiResponseUtils.success();
@@ -150,5 +152,14 @@ public class PlatElderSleepController {
        huiNengService.bodyAlarm("1712384736845950978","219A04X1856F6D8",jsonObject);
        return ApiResponseUtils.success();
    }
+    @ApiOperation("起床测试")
+    @GetMapping("getup")
+    @AuthIgnore
+    @TenantIdIgnore
+    public ApiResponseEntity<List<wakeUpAnalysisVO>> elderGetUpAnalysisTask(@RequestParam Integer month,
+                                                                            @RequestParam Integer day) {
+        return ApiResponseUtils.success(platElderBreatheAnalysisService.elderGetUpAnalysisTask(month, day));
+    }
 }
--- a/server-service/src/main/java/com/makeit/service/platform/elder/PlatElderBreatheAnalysisService.java
+++ b/server-service/src/main/java/com/makeit/service/platform/elder/PlatElderBreatheAnalysisService.java
@@ -2,6 +2,7 @@ package com.makeit.service.platform.elder;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.makeit.entity.platform.elder.PlatElderBreatheAnalysis;
+import com.makeit.vo.platform.elder.wakeUpAnalysisVO;
 import java.util.List;
@@ -16,4 +17,6 @@ import java.util.List;
 public interface PlatElderBreatheAnalysisService extends IService<PlatElderBreatheAnalysis> {
    List<PlatElderBreatheAnalysis> elderHeartRespiratoryAnalysisTask(Integer month, Integer day);
+    List<wakeUpAnalysisVO> elderGetUpAnalysisTask(Integer month, Integer day);
 }
--- a/server-service/src/main/java/com/makeit/service/platform/elder/PlatElderSleepService.java
+++ b/server-service/src/main/java/com/makeit/service/platform/elder/PlatElderSleepService.java
@@ -23,4 +23,6 @@ public interface PlatElderSleepService extends IService<PlatElderSleep> {
    String calculateScores(long daySleepTime, long dayRestTime, long deepTime, long soberTime, long lightTime,
                                  SaasSleepEvaluateStandardReport evaluateStandardReport);
+    List<PlatElderSleep> mergeWakeUpList(List<PlatElderSleep> elderSleepList, int riseRepeatThreshold);
 }
--- a/server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderBreatheAnalysisServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderBreatheAnalysisServiceImpl.java
--- a/server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderSleepServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderSleepServiceImpl.java
 package com.makeit.service.platform.elder.impl;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
@@ -89,11 +90,6 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
    public List<PlatElderSleepAnalysis> elderSleepSleepAnalysisTask(Integer month,Integer day) {
        List<String> dayHourRangeList = getLastDayHourRange(month,day);
-        // Calendar calendar = Calendar.getInstance();
-        // calendar.setTime(new Date());
-        // calendar.add(Calendar.DAY_OF_MONTH, -1);
-        // Date previousDate = calendar.getTime();
-        // String currentDate = DateUtil.format(previousDate, DatePattern.NORM_DATE_PATTERN);
        String currentDate = LocalDate.now().minusDays(1).toString();
        if(month != null && day != null){
            currentDate = LocalDate.of(2023, month, day).minusDays(1).toString();
@@ -155,6 +151,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
                        .filter(deviceOperationLogEntity -> deviceOperationLogEntity.getType().contains("reportProperty"))
                        .map(deviceOperationLogEntity -> {
                            DeviceInfoContentBreathe deviceInfoContentBreathe = JsonUtil.toObj((String) deviceOperationLogEntity.getContent(), DeviceInfoContentBreathe.class);
+                            assert deviceInfoContentBreathe != null;
                            deviceInfoContentBreathe.setReportTime(formatLongTime(deviceInfoContentBreathe.getTimestamp()));
                            return deviceInfoContentBreathe;
                        })
@@ -187,8 +184,8 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
                    boolean isAction = false; // 每分钟是否动过
                    AnalysisVO analysisVO = new AnalysisVO();
                    int getUpBodymoveCount = 0;
-                    boolean isMoveBed = true;
+                    boolean isMoveBed = false;
-                    boolean awakeMinuteActionFlag = true;  // 清醒每分钟体动是否满足要求
+                    boolean awakeMinuteActionFlag = false;  // 清醒每分钟体动是否满足要求
                    int noPersonCount = 0; // 无人跳过计数
                    int sleepDeepMinuteCount = 0;  // 深睡每分钟体动和翻身次数
@@ -201,8 +198,9 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
                        int hr = breatheProperties.getHr();
                        Integer hasPerson = breatheProperties.getPerson(); // 0无人，1有人
-                        if (breatheProperties.getPerson() == 0) {
+                        if (hasPerson == 0) {
                            noPersonCount++;
+                            isMoveBed = true;
                            continue;
                        }
                        // 0和255直接跳过
@@ -222,7 +220,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
                            turnoverCount++;
                        }
                        // 判断入睡时间的体动阈值
-                        if (bodymove > sleepTimeActionThreshold) {
+                        if (bodymove >= sleepTimeActionThreshold) {
                            isAction = true;
                        }
                        // 起床每分钟体动次数
@@ -230,15 +228,10 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
                            getUpBodymoveCount++;
                        }
                        // 清醒
-                        if (bodymove < awakeThreshold || hasPerson == 1) {
+                        if (bodymove > awakeThreshold) {
-                            awakeMinuteActionFlag = false;
+                            awakeMinuteActionFlag = true;
-                        }
-                        //  判断有没有离开床
-                        if (hasPerson == 1) {
-                            isMoveBed = false;
                        }
                        if (br > maxBr) {
                            maxBr = br;
                        }
@@ -252,7 +245,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
                        if (hr < minHr) {
                            minHr = hr;
                        }
-                        if (breatheProperties.getPerson() == 1) {
+                        if (hasPerson == 1) {
                            totalBr += br;
                            totalHr += hr;
                            hrBrCount++;
@@ -705,7 +698,9 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
                    dayRestTime += elderSleep.getInterval();
                }
            }
-            platElderSleepService.saveBatch(elderSleepList);
+            int riseRepeatThreshold = Integer.parseInt(analysisModel.getRiseRepeatThreshold());
+            List<PlatElderSleep> mergeElderSleepList = mergeWakeUpList(elderSleepList, riseRepeatThreshold);
+            platElderSleepService.saveBatch(mergeElderSleepList);
            String score = calculateScores(daySleepTime, dayRestTime, deepTime, soberTime, lightTime, evaluateStandardReport);
            EvaluateReportVO sleepReport = saasSleepEvaluateReportService.getByScore(Long.parseLong(score));
@@ -728,6 +723,52 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
        return result;
    }
+    /**
+     * @param elderSleepList
+     * @param riseRepeatThreshold 且在 （2） 小时内无再次入睡
+     * @return
+     */
+    @Override
+    public List<PlatElderSleep> mergeWakeUpList(List<PlatElderSleep> elderSleepList, int riseRepeatThreshold) {
+        List<PlatElderSleep> result = new ArrayList<>();
+        if (CollUtil.isEmpty(elderSleepList)) {
+            return elderSleepList;
+        }
+        elderSleepList = elderSleepList.stream().sorted(Comparator.comparing(PlatElderSleep::getStartSleep))
+                .collect(Collectors.toList());
+        List<PlatElderSleep> finalElderSleepList = elderSleepList;
+        List<PlatElderSleep> mergeSleepList = new ArrayList<>();
+        finalElderSleepList.forEach(e -> {
+            if (mergeSleepList.contains(e)) {
+                return;
+            }
+            // 2小时内再次入睡的数据，合并
+            List<PlatElderSleep> riseSleepList = finalElderSleepList.stream().filter(f -> Duration.between(e.getEndSleep(),
+                    f.getStartSleep()).toHours() < riseRepeatThreshold).collect(Collectors.toList());
+            if (CollUtil.isEmpty(riseSleepList)) {
+                result.add(e);
+                return;
+            }
+            mergeSleepList.addAll(riseSleepList);
+            PlatElderSleep maxSleepTime = finalElderSleepList.stream().max(Comparator.comparing(f -> Duration.between(f.getStartSleep(),
+                    f.getEndSleep()).toMinutes() > Duration.between(e.getStartSleep(),
+                    e.getEndSleep()).toMinutes())).orElse(e);
+            PlatElderSleep last = riseSleepList.get(riseSleepList.size() - 1);
+            e.setElderSleepType(maxSleepTime.getElderSleepType());
+            e.setEndSleep(last.getEndSleep());
+            List<PlatSleepRangeVO> sleepRecord = e.getSleepRecord();
+            Set<PlatSleepRangeVO> platSleepRangeVOS = new LinkedHashSet<>(sleepRecord);
+            riseSleepList.forEach(r -> platSleepRangeVOS.addAll(r.getSleepRecord()));
+            e.setSleepRecord(new ArrayList<>(platSleepRangeVOS));
+            result.add(e);
+        });
+        return result;
+    }
    @Override
    public String calculateScores(long daySleepTime, long dayRestTime, long deepTime, long soberTime, long lightTime,
                                  SaasSleepEvaluateStandardReport evaluateStandardReport) {

--- a/server-service/src/main/java/com/makeit/vo/platform/elder/wakeUpAnalysisVO.java
+++ b/server-service/src/main/java/com/makeit/vo/platform/elder/wakeUpAnalysisVO.java
+package com.makeit.vo.platform.elder;
+import lombok.Data;
+import java.time.LocalDateTime;
+import java.util.List;
+/**
+ * @author wangzy
+ * @description
+ * @createDate 2023-12-29-14:48
+ */
+@Data
+public class wakeUpAnalysisVO {
+    private List<LocalDateTime> wakeUpList;
+    private List<LocalDateTime> leaveOverTimeList;
+    private String elderId;
+    private String name;
+}
--- a/server-web/src/test/java/com/makeit/iotapi/IotDeviceInfoContentFall.java
+++ b/server-web/src/test/java/com/makeit/iotapi/IotDeviceInfoContentFall.java
 package com.makeit.iotapi;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.makeit.dto.platform.alarm.PlatAlarmCheckDTO;
 import com.makeit.entity.platform.device.PlatDevice;
+import com.makeit.entity.platform.elder.PlatElderSleep;
+import com.makeit.global.annotation.AuthIgnore;
+import com.makeit.global.aspect.tenant.TenantIdIgnore;
 import com.makeit.module.admin.vo.plat.PlatTenantVO;
 import com.makeit.module.iot.service.IotOrgService;
 import com.makeit.module.iot.service.IotProductDeviceService;
 import com.makeit.module.iot.service.IotTokenService;
 import com.makeit.service.platform.alarm.alarmStrategy.OffBedAlarm;
+import com.makeit.service.platform.elder.PlatElderSleepService;
 import com.makeit.utils.redis.RedisUtil;
 import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -27,6 +35,11 @@ public class IotDeviceInfoContentFall {
    private IotProductDeviceService iotProductDeviceService;
    @Autowired
    private OffBedAlarm offBedAlarm;
+    @Autowired
+    private PlatElderSleepService platElderSleepService;
+    private static final Logger logger = LoggerFactory.getLogger(IotDeviceInfoContentFall.class);
    @Test
@@ -114,4 +127,27 @@ public class IotDeviceInfoContentFall {
        System.out.println(list);
    }
+    @Test
+    @TenantIdIgnore
+    @AuthIgnore
+    void mergeElderSleepList() {
+        List<PlatElderSleep> sleepList = platElderSleepService.list(Wrappers.<PlatElderSleep>lambdaQuery()
+                .eq(PlatElderSleep::getHappenDate, "2024-01-01").eq(PlatElderSleep::getElderId, "1712648603580764161"));
+        logger.info("ori sleep data :{}", JSONUtil.toJsonStr(sleepList));
+        List<PlatElderSleep> platElderSleeps = recursion(sleepList, sleepList.size() / 2, 3);
+        logger.info("end sleep data :{}", JSONUtil.toJsonStr(platElderSleeps));
+        List<PlatElderSleep> list = platElderSleepService.mergeWakeUpList(sleepList, 3);
+        System.out.println(list);
+    }
+    private List<PlatElderSleep> recursion(List<PlatElderSleep> elderSleepList, int count, int riseRepeatThreshold) {
+        List<PlatElderSleep> platElderSleeps = platElderSleepService.mergeWakeUpList(elderSleepList, riseRepeatThreshold);
+        if (count == 0) {
+            return platElderSleeps;
+        } else {
+            count--;
+            return recursion(platElderSleeps, count, riseRepeatThreshold);
+        }
+    }
 }