saas端--租户设备管理-查看-数据分析--周报报错

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

@@ -384,13 +384,13 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
         List<LocalDate> dateList = LocalDateTimeUtils.getDateSeries(weekStartDate, weekEndDate);
 
         String deviceId = null;
-        String oriDeviceId = null;
+        //String oriDeviceId = null;
 
         PlatDevice platDevice = platElderRealTimeService.getBreathDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
 
         if (platDevice != null) {
             deviceId = platDevice.getId();
-            oriDeviceId = platDevice.getOriDeviceId();
+            //oriDeviceId = platDevice.getOriDeviceId();
         }
 
         LambdaQueryWrapper<PlatElderBreatheDayStat> lambdaQueryWrapper = new QueryWrapper<PlatElderBreatheDayStat>().lambda();
@@ -399,17 +399,17 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
         lambdaQueryWrapper.le(PlatElderBreatheDayStat::getDay, weekEndDate);
 
         String finalDeviceId = deviceId;
-        String finalOriDeviceId = oriDeviceId;
-        lambdaQueryWrapper.and(StringUtils.isNotBlank(platElderIdDTO.getElderId()) || StringUtils.isNotBlank(finalDeviceId) || StringUtils.isNotBlank(finalOriDeviceId), qw -> {
+        //String finalOriDeviceId = oriDeviceId;
+        lambdaQueryWrapper.and(StringUtils.isNotBlank(platElderIdDTO.getElderId()) || StringUtils.isNotBlank(finalDeviceId) /*|| StringUtils.isNotBlank(finalOriDeviceId)*/, qw -> {
             if (StringUtils.isNotBlank(platElderIdDTO.getElderId())) {
                 qw.eq(PlatElderBreatheDayStat::getElderId, platElderIdDTO.getElderId());
             }
             if (StringUtils.isNotBlank(finalDeviceId)) {
                 qw.or().eq(PlatElderBreatheDayStat::getDeviceId, finalDeviceId);
             }
-            if (StringUtils.isNotBlank(finalOriDeviceId)) {
-                qw.or().eq(PlatElderBreatheDayStat::getOriDeviceId, finalOriDeviceId);
-            }
+//            if (StringUtils.isNotBlank(finalOriDeviceId)) {
+//                qw.or().eq(PlatElderBreatheDayStat::getOriDeviceId, finalOriDeviceId);
+//            }
         });
 
 
@@ -417,7 +417,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
 
         List<PlatElderBreatheDayStat> breatheDayStatList = platElderBreatheDayStatService.list(lambdaQueryWrapper);
 
-        Map<LocalDate, PlatElderBreatheDayStat> map = StreamUtil.toMap(breatheDayStatList, PlatElderBreatheDayStat::getDay);
+        Map<LocalDate, PlatElderBreatheDayStat> map = StreamUtil.toMapDep(breatheDayStatList, PlatElderBreatheDayStat::getDay);
 
         List<PlatElderRealTimeHeartRespiratoryWeekVO> voList = new ArrayList<>(10);