fix：sa'as设备数据分析

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

@@ -70,6 +70,8 @@ public interface PlatElderService extends IService<PlatElder> {
     void batchEdit(PlatElderBatchEditDTOVO dto);
 
     List<PlatElderListVO> listByElder(PlatElderQueryDTO dto);
+
+    PlatElder getByDeviceId(String deviceId);
     /*小程序*/
 
 }

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

@@ -75,6 +75,8 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
 
     @Autowired
     private PlatElderSleepAnalysisService platElderSleepAnalysisService;
+    @Autowired
+    private PlatElderService platElderService;
 
     private LocalDateTime weekStartDateTime(LocalDateTime defaultTime) {
         return weekStartDateTime(LocalDate.now().minusDays(1), defaultTime);
@@ -174,9 +176,15 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
     public PlatElderSleepEvaluationVO sleepEvaluationInternal(PlatElderReportDTO platElderIdDTO, LocalDate weekStartDate, LocalDate weekEndDate) {
 
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-
+        String elderId = platElderIdDTO.getElderId();
+        if (StringUtils.isNotEmpty(platElderIdDTO.getDeviceId())) {
+            PlatElder platElder = platElderService.getByDeviceId(platElderIdDTO.getDeviceId());
+            if (platElder != null) {
+                elderId = platElder.getId();
+            }
+        }
         List<PlatElderSleepAnalysis> sleepAnalysisList = platElderSleepAnalysisService.list(new QueryWrapper<PlatElderSleepAnalysis>().lambda()
-                .eq(PlatElderSleepAnalysis::getElderId, platElderIdDTO.getElderId())
+                .eq(PlatElderSleepAnalysis::getElderId, elderId)
                 .ge(PlatElderSleepAnalysis::getHappenDate, dateTimeFormatter.format(weekStartDate))
                 .le(PlatElderSleepAnalysis::getHappenDate, dateTimeFormatter.format(weekEndDate))
         );
@@ -239,15 +247,21 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
         LocalDate weekEndDate = weekEndDate(platElderIdDTO.getEndTime());
 
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-
+        String elderId = platElderIdDTO.getElderId();
+        if (StringUtils.isNotEmpty(platElderIdDTO.getDeviceId())) {
+            PlatElder platElder = platElderService.getByDeviceId(platElderIdDTO.getDeviceId());
+            if (platElder != null) {
+                elderId = platElder.getId();
+            }
+        }
         List<PlatElderSleep> sleepList = platElderSleepService.list(new QueryWrapper<PlatElderSleep>().lambda()
-                .eq(PlatElderSleep::getElderId, platElderIdDTO.getElderId())
+                .eq(PlatElderSleep::getElderId, elderId)
                 .ge(PlatElderSleep::getHappenDate, dateTimeFormatter.format(weekStartDate))
                 .le(PlatElderSleep::getHappenDate, dateTimeFormatter.format(weekEndDate))
         );
 
         List<PlatElderSleepAnalysis> sleepAnalysisList = platElderSleepAnalysisService.list(new QueryWrapper<PlatElderSleepAnalysis>().lambda()
-                .eq(PlatElderSleepAnalysis::getElderId, platElderIdDTO.getElderId())
+                .eq(PlatElderSleepAnalysis::getElderId, elderId)
                 .ge(PlatElderSleepAnalysis::getHappenDate, dateTimeFormatter.format(weekStartDate))
                 .le(PlatElderSleepAnalysis::getHappenDate, dateTimeFormatter.format(weekEndDate))
         );
@@ -317,9 +331,15 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
     public PlatElderHeartRespiratoryEvaluationVO heartRespiratoryEvaluationInternal(PlatElderReportDTO platElderIdDTO, LocalDate weekStartDate, LocalDate weekEndDate) {
 
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-
+        String elderId = platElderIdDTO.getElderId();
+        if (StringUtils.isNotEmpty(platElderIdDTO.getDeviceId())) {
+            PlatElder platElder = platElderService.getByDeviceId(platElderIdDTO.getDeviceId());
+            if (platElder != null) {
+                elderId = platElder.getId();
+            }
+        }
         List<PlatElderBreatheAnalysis> breatheAnalyses = platElderBreatheAnalysisService.list(new QueryWrapper<PlatElderBreatheAnalysis>().lambda()
-                .eq(PlatElderBreatheAnalysis::getElderId, platElderIdDTO.getElderId())
+                .eq(PlatElderBreatheAnalysis::getElderId, elderId)
                 .ge(PlatElderBreatheAnalysis::getHappenDate, dateTimeFormatter.format(weekStartDate))
                 .le(PlatElderBreatheAnalysis::getHappenDate, dateTimeFormatter.format(weekEndDate))
         );

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

@@ -25,6 +25,7 @@ import com.makeit.entity.platform.elder.PlatElderOtherInfo;
 import com.makeit.entity.platform.elder.PlatElderSocialRelation;
 import com.makeit.entity.platform.space.PlatBed;
 import com.makeit.entity.platform.space.PlatRoom;
+import com.makeit.entity.platform.space.PlatRoomBedDevice;
 import com.makeit.entity.platform.space.PlatSpace;
 import com.makeit.enums.CodeMessageEnum;
 import com.makeit.enums.CommonEnum;
@@ -1191,6 +1192,19 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
         return voList;
 
     }
+
+    @Override
+    public PlatElder getByDeviceId(String deviceId) {
+        PlatRoomBedDevice platRoomBedDevice = platRoomBedDeviceService.getOne(new QueryWrapper<PlatRoomBedDevice>().lambda()
+                .eq(PlatRoomBedDevice::getDeviceId, deviceId)
+                .last("limit 1"));
+        if (platRoomBedDevice != null && StringUtils.isNotEmpty(platRoomBedDevice.getBedId())) {
+            PlatElder platElder = getOne(new QueryWrapper<PlatElder>().lambda()
+                    .eq(PlatElder::getBedId, platRoomBedDevice.getBedId()));
+            return platElder;
+        }
+        return null;
+    }
 }
 //TODO ywc 数据字典
 //还有空间相关的没有 列表 详情 导入 导出