Commit d7be35f9 by 罗志长

fix:saas设备呼吸心率日报区分租户

parent 738a0c26
......@@ -9,6 +9,6 @@ public interface PlatElderBreatheHeartRateRecordService extends IService<PlatEld
void breatheHeartRateRecordTask();
List<PlatElderBreatheHeartRateRecord> list(String elderId, String iotDeviceId, long start, long end);
List<PlatElderBreatheHeartRateRecord> list(String elderId, String iotDeviceId, String tenantId, long start, long end);
}
......@@ -71,10 +71,11 @@ public class PlatElderBreatheHeartRateRecordServiceImpl extends ServiceImpl<Plat
}
@Override
public List<PlatElderBreatheHeartRateRecord> list(String elderId, String iotDeviceId, long start, long end) {
public List<PlatElderBreatheHeartRateRecord> list(String elderId, String iotDeviceId, String tenantId, long start, long end) {
LambdaQueryWrapper<PlatElderBreatheHeartRateRecord> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(StringUtils.isNotBlank(elderId), PlatElderBreatheHeartRateRecord::getElderId, elderId);
queryWrapper.eq(StringUtils.isNotBlank(iotDeviceId), PlatElderBreatheHeartRateRecord::getIotDeviceId, iotDeviceId);
queryWrapper.eq(StringUtils.isNotBlank(tenantId), PlatElderBreatheHeartRateRecord::getTenantId, tenantId);
queryWrapper.ge(PlatElderBreatheHeartRateRecord::getReportTime, start);
queryWrapper.le(PlatElderBreatheHeartRateRecord::getReportTime, end);
return list(queryWrapper);
......
......@@ -343,7 +343,8 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
long reportTimeStart = LocalDateTimeUtils.getMilliSecond(start);
long reportTimeEnd = LocalDateTimeUtils.getMilliSecond(end);
List<PlatElderBreatheHeartRateRecord> list = platElderBreatheHeartRateRecordService.list(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId(), reportTimeStart, reportTimeEnd);
List<PlatElderBreatheHeartRateRecord> list = platElderBreatheHeartRateRecordService
.list(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId(), platElderIdDTO.getTenantId(), reportTimeStart, reportTimeEnd);
return StreamUtil.map(list, e -> {
PlatElderRealTimeHeartRespiratoryVO vo = new PlatElderRealTimeHeartRespiratoryVO();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment