fix：呼吸心率日报

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

@@ -9,6 +9,6 @@ public interface PlatElderBreatheHeartRateRecordService extends IService<PlatEld
 
 
     void breatheHeartRateRecordTask();
     void breatheHeartRateRecordTask();
 
 
-    List<PlatElderBreatheHeartRateRecord> list(String elderId, long start, long end);
+    List<PlatElderBreatheHeartRateRecord> list(String elderId, String iotDeviceId, long start, long end);
 
 
 }
 }

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

@@ -16,6 +16,7 @@ import com.makeit.service.platform.elder.PlatElderService;
 import com.makeit.utils.data.convert.StreamUtil;
 import com.makeit.utils.data.convert.StreamUtil;
 import com.makeit.utils.time.LocalDateTimeUtils;
 import com.makeit.utils.time.LocalDateTimeUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -70,9 +71,10 @@ public class PlatElderBreatheHeartRateRecordServiceImpl extends ServiceImpl<Plat
     }
     }
 
 
     @Override
     @Override
-    public List<PlatElderBreatheHeartRateRecord> list(String elderId, long start, long end) {
+    public List<PlatElderBreatheHeartRateRecord> list(String elderId, String iotDeviceId, long start, long end) {
         LambdaQueryWrapper<PlatElderBreatheHeartRateRecord> queryWrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<PlatElderBreatheHeartRateRecord> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(PlatElderBreatheHeartRateRecord::getElderId, elderId);
+        queryWrapper.eq(StringUtils.isNotBlank(elderId), PlatElderBreatheHeartRateRecord::getElderId, elderId);
+        queryWrapper.eq(StringUtils.isNotBlank(iotDeviceId), PlatElderBreatheHeartRateRecord::getIotDeviceId, iotDeviceId);
         queryWrapper.ge(PlatElderBreatheHeartRateRecord::getReportTime, start);
         queryWrapper.ge(PlatElderBreatheHeartRateRecord::getReportTime, start);
         queryWrapper.le(PlatElderBreatheHeartRateRecord::getReportTime, end);
         queryWrapper.le(PlatElderBreatheHeartRateRecord::getReportTime, end);
         return list(queryWrapper);
         return list(queryWrapper);

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

@@ -286,7 +286,7 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
         long reportTimeStart = LocalDateTimeUtils.getMilliSecond(start);
         long reportTimeStart = LocalDateTimeUtils.getMilliSecond(start);
         long reportTimeEnd = LocalDateTimeUtils.getMilliSecond(end);
         long reportTimeEnd = LocalDateTimeUtils.getMilliSecond(end);
 
 
-        List<PlatElderBreatheHeartRateRecord> list = platElderBreatheHeartRateRecordService.list(platElderIdDTO.getElderId(), reportTimeStart, reportTimeEnd);
+        List<PlatElderBreatheHeartRateRecord> list = platElderBreatheHeartRateRecordService.list(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId(), reportTimeStart, reportTimeEnd);
         return StreamUtil.map(list, e -> {
         return StreamUtil.map(list, e -> {
 
 
             PlatElderRealTimeHeartRespiratoryVO vo = new PlatElderRealTimeHeartRespiratoryVO();
             PlatElderRealTimeHeartRespiratoryVO vo = new PlatElderRealTimeHeartRespiratoryVO();