Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit f630ced3 by huangjy
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 280123bf 2ab24c2c
Inline Side-by-side
Showing with 8 additions and 0 deletions
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportDayServiceImpl.java
...@@ -109,6 +109,7 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe ...@@ -109,6 +109,7 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
String elderId = platElderIdDTO.getElderId(); String elderId = platElderIdDTO.getElderId();
String deviceId = platElderIdDTO.getDeviceId(); String deviceId = platElderIdDTO.getDeviceId();
String tenantId = platElderIdDTO.getTenantId();
// if (StringUtils.isNotEmpty(deviceId)) { // if (StringUtils.isNotEmpty(deviceId)) {
// PlatElder platElder = platElderService.getByDeviceId(deviceId,platElderIdDTO.getTenantId()); // PlatElder platElder = platElderService.getByDeviceId(deviceId,platElderIdDTO.getTenantId());
// if (platElder != null) { // if (platElder != null) {
...@@ -121,6 +122,7 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe ...@@ -121,6 +122,7 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
.eq(StrUtil.isNotBlank(elderId), PlatElderSleepAnalysis::getElderId, elderId) .eq(StrUtil.isNotBlank(elderId), PlatElderSleepAnalysis::getElderId, elderId)
.eq(PlatElderSleepAnalysis::getHappenDate, nowString) .eq(PlatElderSleepAnalysis::getHappenDate, nowString)
.eq(StrUtil.isNotBlank(deviceId), PlatElderSleepAnalysis::getOriDeviceId, deviceId) .eq(StrUtil.isNotBlank(deviceId), PlatElderSleepAnalysis::getOriDeviceId, deviceId)
.eq(StrUtil.isNotBlank(tenantId), PlatElderSleepAnalysis::getTenantId, tenantId)
.last("limit 1") .last("limit 1")
); );
...@@ -248,6 +250,7 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe ...@@ -248,6 +250,7 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
String nowString = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(now); String nowString = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(now);
String elderId = platElderIdDTO.getElderId(); String elderId = platElderIdDTO.getElderId();
String deviceId = platElderIdDTO.getDeviceId(); String deviceId = platElderIdDTO.getDeviceId();
String tenantId = platElderIdDTO.getTenantId();
// if (StringUtils.isNotEmpty(deviceId)) { // if (StringUtils.isNotEmpty(deviceId)) {
// PlatElder platElder = platElderService.getByDeviceId(deviceId, platElderIdDTO.getTenantId()); // PlatElder platElder = platElderService.getByDeviceId(deviceId, platElderIdDTO.getTenantId());
// if (platElder != null) { // if (platElder != null) {
...@@ -257,6 +260,7 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe ...@@ -257,6 +260,7 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
PlatElderBreatheAnalysis platElderSleepAnalysis = platElderBreatheAnalysisService.getOne(new QueryWrapper<PlatElderBreatheAnalysis>().lambda() PlatElderBreatheAnalysis platElderSleepAnalysis = platElderBreatheAnalysisService.getOne(new QueryWrapper<PlatElderBreatheAnalysis>().lambda()
.eq(StrUtil.isNotBlank(elderId), PlatElderBreatheAnalysis::getElderId, elderId) .eq(StrUtil.isNotBlank(elderId), PlatElderBreatheAnalysis::getElderId, elderId)
.eq(StrUtil.isNotBlank(deviceId), PlatElderBreatheAnalysis::getOriDeviceId, deviceId) .eq(StrUtil.isNotBlank(deviceId), PlatElderBreatheAnalysis::getOriDeviceId, deviceId)
.eq(StrUtil.isNotBlank(tenantId), PlatElderBreatheAnalysis::getTenantId, tenantId)
.eq(PlatElderBreatheAnalysis::getHappenDate, nowString) .eq(PlatElderBreatheAnalysis::getHappenDate, nowString)
.last("limit 1") .last("limit 1")
); );
......
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportWeekServiceImpl.java
...@@ -173,6 +173,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek ...@@ -173,6 +173,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String elderId = platElderIdDTO.getElderId(); String elderId = platElderIdDTO.getElderId();
String deviceId = platElderIdDTO.getDeviceId(); String deviceId = platElderIdDTO.getDeviceId();
String tenantId = platElderIdDTO.getTenantId();
// if (StringUtils.isNotEmpty(deviceId)) { // if (StringUtils.isNotEmpty(deviceId)) {
// PlatElder platElder = platElderService.getByDeviceId(deviceId, platElderIdDTO.getTenantId()); // PlatElder platElder = platElderService.getByDeviceId(deviceId, platElderIdDTO.getTenantId());
// if (platElder != null) { // if (platElder != null) {
...@@ -183,6 +184,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek ...@@ -183,6 +184,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
.eq(StrUtil.isNotBlank(elderId), PlatElderSleepAnalysis::getElderId, elderId) .eq(StrUtil.isNotBlank(elderId), PlatElderSleepAnalysis::getElderId, elderId)
.ge(PlatElderSleepAnalysis::getHappenDate, dateTimeFormatter.format(weekStartDate)) .ge(PlatElderSleepAnalysis::getHappenDate, dateTimeFormatter.format(weekStartDate))
.eq(StrUtil.isNotBlank(deviceId), PlatElderSleepAnalysis::getOriDeviceId, deviceId) .eq(StrUtil.isNotBlank(deviceId), PlatElderSleepAnalysis::getOriDeviceId, deviceId)
.eq(StrUtil.isNotBlank(tenantId), PlatElderSleepAnalysis::getTenantId, tenantId)
.le(PlatElderSleepAnalysis::getHappenDate, dateTimeFormatter.format(weekEndDate)) .le(PlatElderSleepAnalysis::getHappenDate, dateTimeFormatter.format(weekEndDate))
); );
...@@ -331,6 +333,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek ...@@ -331,6 +333,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
String elderId = platElderIdDTO.getElderId(); String elderId = platElderIdDTO.getElderId();
String deviceId = platElderIdDTO.getDeviceId(); String deviceId = platElderIdDTO.getDeviceId();
String tenantId = platElderIdDTO.getTenantId();
// if (StringUtils.isNotEmpty(deviceId)) { // if (StringUtils.isNotEmpty(deviceId)) {
// PlatElder platElder = platElderService.getByDeviceId(deviceId, platElderIdDTO.getTenantId()); // PlatElder platElder = platElderService.getByDeviceId(deviceId, platElderIdDTO.getTenantId());
// if (platElder != null) { // if (platElder != null) {
...@@ -341,6 +344,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek ...@@ -341,6 +344,7 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
.eq(StrUtil.isNotBlank(elderId), PlatElderBreatheAnalysis::getElderId, elderId) .eq(StrUtil.isNotBlank(elderId), PlatElderBreatheAnalysis::getElderId, elderId)
.ge(PlatElderBreatheAnalysis::getHappenDate, dateTimeFormatter.format(weekStartDate)) .ge(PlatElderBreatheAnalysis::getHappenDate, dateTimeFormatter.format(weekStartDate))
.eq(StrUtil.isNotBlank(deviceId), PlatElderBreatheAnalysis::getOriDeviceId, deviceId) .eq(StrUtil.isNotBlank(deviceId), PlatElderBreatheAnalysis::getOriDeviceId, deviceId)
.eq(StrUtil.isNotBlank(tenantId), PlatElderBreatheAnalysis::getTenantId, tenantId)
.le(PlatElderBreatheAnalysis::getHappenDate, dateTimeFormatter.format(weekEndDate)) .le(PlatElderBreatheAnalysis::getHappenDate, dateTimeFormatter.format(weekEndDate))
); );
......
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