fix:bug修改

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

@@ -128,16 +128,16 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
                     noPersonCount++;
                     isMoveBed = true;
                     awakeMinuteActionFlag = true;
-                    continue;
+                    // continue;
                 }
                 // 0和255直接跳过
                 if (breatheProperties.getHr() == 255 || breatheProperties.getHr() == 0) {
                     noPersonCount++;
-                    continue;
+                    // continue;
                 }
                 if (breatheProperties.getBr() == 255 || breatheProperties.getBr() == 0) {
                     noPersonCount++;
-                    continue;
+                    // continue;
                 }
                 if (bodyMove > actionThreshold) {
                     bodymoveCount++;
@@ -179,9 +179,9 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
                     hrBrCount++;
                 }
             }
-            if (reportSize == noPersonCount) {
-                continue;
-            }
+            // if (reportSize == noPersonCount) {
+            //     continue;
+            // }
             // 每分钟的数据
             analysisVO.setTotalBr(totalBr);
             analysisVO.setAvgBr(totalBr / reportSize);
@@ -461,6 +461,14 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
         SleepCountDTO sleepCountDTO = new SleepCountDTO();
         sleepCountDTO.setDaySleepMap(daySleepMap);
         sleepCountDTO.setRestSleepMap(restSleepMap);
+        TreeMap<String, TreeMap<String, AnalysisVO>> allSleepMap = new TreeMap<>();
+        if (CollUtil.isNotEmpty(daySleepMap)) {
+            allSleepMap.putAll(daySleepMap);
+        }
+        if (CollUtil.isNotEmpty(restSleepMap)) {
+            allSleepMap.putAll(restSleepMap);
+        }
+        sleepCountDTO.setAllSleepMap(allSleepMap);
         return sleepCountDTO;
     }
 
@@ -778,17 +786,14 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
 
         for (PlatRoomBedDevice platRoomBedDevice : platRoomBedDeviceList) {
             TreeMap<String, AnalysisVO> totalMap = new TreeMap<>();
-            // if (!"1732647368962203650".equals(platRoomBedDevice.getId())) {
-            //     continue;
-            // }
             String bedId = platRoomBedDevice.getBedId();
             PlatElder elder = platElderService.getOne(new QueryWrapper<PlatElder>().lambda()
                     .eq(PlatElder::getBedId, bedId));
-            if (elder == null) {
+            if (elder == null || !"1712648603580764161".equals(elder.getId())) {
                 continue;
             }
             PlatDevice platDevice = platDeviceService.getById(platRoomBedDevice.getDeviceId());
-            if (platDevice == null ) {
+            if (platDevice == null || !"218A00XE2669104".equals(platDevice.getOriDeviceId())) {
                 continue;
             }
             String tenantId = elder.getTenantId();
@@ -812,7 +817,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
                 TreeMap<String, AnalysisVO> statisticsMap = getPerMinuteData(minuteMap, analysisModel);
                 if (CollUtil.isNotEmpty(statisticsMap)) {
                     //测试环境数据 device_minute_info
-                   // testLogService.saveEntity(statisticsMap, platRoomBedDevice.getId());
+                    // deviceLogService.saveEntity(statisticsMap, platRoomBedDevice.getId());
                     totalMap.putAll(statisticsMap);
                 }
             }
@@ -831,7 +836,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
             // 获取睡眠和小憩
             SleepCountDTO sleepCountDTO = deepSleepAndRestData(sleepTypeMap, analysisModel, sleepTimeAnalysisVOList);
             // 满足睡眠条件的map
-            TreeMap<String, TreeMap<String, AnalysisVO>> daySleepMap = sleepCountDTO.getDaySleepMap();
+            TreeMap<String, TreeMap<String, AnalysisVO>> daySleepMap = sleepCountDTO.getAllSleepMap();
             // 深度睡眠
             deepSleepData(daySleepMap, analysisModel, sleepTimeAnalysisVOList);
             // 中度睡眠