Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 546058a2 by 汪志阳
Options

fix:saas端日报周报按设备查询

parent 12e4ce5b
Inline Side-by-side
Showing with 41 additions and 33 deletions
saas-module/src/main/java/com/makeit/controller/device/SaasDeviceReportDayController.java
...@@ -59,6 +59,7 @@ public class SaasDeviceReportDayController { ...@@ -59,6 +59,7 @@ public class SaasDeviceReportDayController {
@ApiOperation("心率呼吸评价") @ApiOperation("心率呼吸评价")
@PostMapping("heartRespiratoryEvaluation") @PostMapping("heartRespiratoryEvaluation")
@TenantIdIgnore @TenantIdIgnore
@AuthIgnore
public ApiResponseEntity<PlatElderHeartRespiratoryEvaluationVO> heartRespiratoryEvaluation(@RequestBody PlatElderReportDTO platElderIdDTO) { public ApiResponseEntity<PlatElderHeartRespiratoryEvaluationVO> heartRespiratoryEvaluation(@RequestBody PlatElderReportDTO platElderIdDTO) {
return ApiResponseUtils.success(platElderDayReportDayService.heartRespiratoryEvaluation(platElderIdDTO)); return ApiResponseUtils.success(platElderDayReportDayService.heartRespiratoryEvaluation(platElderIdDTO));
} }
......
server-module/src/main/java/com/makeit/module/controller/wechat/alarm/PlatAlarmRecordWechatController.java
...@@ -10,7 +10,6 @@ import com.makeit.common.response.ApiResponseEntity; ...@@ -10,7 +10,6 @@ import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils; import com.makeit.common.response.ApiResponseUtils;
import com.makeit.dto.platform.alarm.PlatAlarmRecordQueryDTO; import com.makeit.dto.platform.alarm.PlatAlarmRecordQueryDTO;
import com.makeit.enums.report.PlatformTypeEnum; import com.makeit.enums.report.PlatformTypeEnum;
import com.makeit.global.annotation.AuthIgnore;
import com.makeit.service.platform.alarm.PlatAlarmRecordService; import com.makeit.service.platform.alarm.PlatAlarmRecordService;
import com.makeit.utils.user.common.CommonUserUtil; import com.makeit.utils.user.common.CommonUserUtil;
import com.makeit.vo.platform.alarm.PlatAlarmRecordVO; import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
...@@ -34,17 +33,14 @@ public class PlatAlarmRecordWechatController { ...@@ -34,17 +33,14 @@ public class PlatAlarmRecordWechatController {
@ApiOperation("列表") @ApiOperation("列表")
@PostMapping("page") @PostMapping("page")
@AuthIgnore
public ApiResponseEntity<Map<String,Object>> page(@RequestBody PageReqDTO<PlatAlarmRecordQueryDTO> dto) { public ApiResponseEntity<Map<String,Object>> page(@RequestBody PageReqDTO<PlatAlarmRecordQueryDTO> dto) {
//小程序告警记录只看到发给自己的告警 //小程序告警记录只看到发给自己的告警
String userId = CommonUserUtil.getUserId(); String userId = CommonUserUtil.getUserId();
// String userId = "1700085146788667394";
PlatAlarmRecordQueryDTO data = dto.getData(); PlatAlarmRecordQueryDTO data = dto.getData();
data.setNotifyUser(userId); data.setNotifyUser(userId);
Map<String,Object> resMap = Maps.newHashMap(); Map<String,Object> resMap = Maps.newHashMap();
PageVO<PlatAlarmRecordVO> page = platAlarmRecordService.page(dto); PageVO<PlatAlarmRecordVO> page = platAlarmRecordService.page(dto);
// boolean b = page.getList().stream().anyMatch(platAlarmRecord -> StringUtils.equals(CommonEnum.NO.getValue(), platAlarmRecord.getStatus()));
boolean b = CollUtil.isNotEmpty(page.getList()) && page.getList().get(0).getStatusFlag(); boolean b = CollUtil.isNotEmpty(page.getList()) && page.getList().get(0).getStatusFlag();
resMap.put("todoFlag",b); resMap.put("todoFlag",b);
resMap.put("page",page); resMap.put("page",page);
......
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportDayServiceImpl.java
package com.makeit.service.platform.elder.impl; package com.makeit.service.platform.elder.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
...@@ -107,17 +108,19 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe ...@@ -107,17 +108,19 @@ 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();
if (StringUtils.isNotEmpty(platElderIdDTO.getDeviceId())) { String deviceId = platElderIdDTO.getDeviceId();
PlatElder platElder = platElderService.getByDeviceId(platElderIdDTO.getDeviceId(),platElderIdDTO.getTenantId()); // if (StringUtils.isNotEmpty(deviceId)) {
if (platElder != null) { // PlatElder platElder = platElderService.getByDeviceId(deviceId,platElderIdDTO.getTenantId());
elderId = platElder.getId(); // if (platElder != null) {
} // elderId = platElder.getId();
} // }
// }
PlatElderSleepAnalysis platElderSleepAnalysis = platElderSleepAnalysisService.getOne(new QueryWrapper<PlatElderSleepAnalysis>().lambda() PlatElderSleepAnalysis platElderSleepAnalysis = platElderSleepAnalysisService.getOne(new QueryWrapper<PlatElderSleepAnalysis>().lambda()
.eq(PlatElderSleepAnalysis::getElderId, elderId) .eq(StrUtil.isNotBlank(elderId), PlatElderSleepAnalysis::getElderId, elderId)
.eq(PlatElderSleepAnalysis::getHappenDate, nowString) .eq(PlatElderSleepAnalysis::getHappenDate, nowString)
.orderBy(true, false, Lists.newArrayList(PlatElderSleepAnalysis::getHappenDate, PlatElderSleepAnalysis::getSleepScore)) .eq(StrUtil.isNotBlank(deviceId), PlatElderSleepAnalysis::getOriDeviceId, deviceId)
.last("limit 1") .last("limit 1")
); );
...@@ -244,15 +247,18 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe ...@@ -244,15 +247,18 @@ 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();
if (StringUtils.isNotEmpty(platElderIdDTO.getDeviceId())) { String deviceId = platElderIdDTO.getDeviceId();
PlatElder platElder = platElderService.getByDeviceId(platElderIdDTO.getDeviceId(), platElderIdDTO.getTenantId()); // if (StringUtils.isNotEmpty(deviceId)) {
if (platElder != null) { // PlatElder platElder = platElderService.getByDeviceId(deviceId, platElderIdDTO.getTenantId());
elderId = platElder.getId(); // if (platElder != null) {
} // elderId = platElder.getId();
} // }
// }
PlatElderBreatheAnalysis platElderSleepAnalysis = platElderBreatheAnalysisService.getOne(new QueryWrapper<PlatElderBreatheAnalysis>().lambda() PlatElderBreatheAnalysis platElderSleepAnalysis = platElderBreatheAnalysisService.getOne(new QueryWrapper<PlatElderBreatheAnalysis>().lambda()
.eq(PlatElderBreatheAnalysis::getElderId, elderId) .eq(StrUtil.isNotBlank(elderId), PlatElderBreatheAnalysis::getElderId, elderId)
.eq(StrUtil.isNotBlank(deviceId), PlatElderBreatheAnalysis::getOriDeviceId, deviceId)
.eq(PlatElderBreatheAnalysis::getHappenDate, nowString) .eq(PlatElderBreatheAnalysis::getHappenDate, nowString)
.last("limit 1")
); );
if (platElderSleepAnalysis == null) { if (platElderSleepAnalysis == null) {
......
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportWeekServiceImpl.java
package com.makeit.service.platform.elder.impl; package com.makeit.service.platform.elder.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.makeit.common.entity.BaseBusEntity; import com.makeit.common.entity.BaseBusEntity;
...@@ -171,15 +172,17 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek ...@@ -171,15 +172,17 @@ 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();
if (StringUtils.isNotEmpty(platElderIdDTO.getDeviceId())) { String deviceId = platElderIdDTO.getDeviceId();
PlatElder platElder = platElderService.getByDeviceId(platElderIdDTO.getDeviceId(), platElderIdDTO.getTenantId()); // if (StringUtils.isNotEmpty(deviceId)) {
if (platElder != null) { // PlatElder platElder = platElderService.getByDeviceId(deviceId, platElderIdDTO.getTenantId());
elderId = platElder.getId(); // if (platElder != null) {
} // elderId = platElder.getId();
} // }
// }
List<PlatElderSleepAnalysis> sleepAnalysisList = platElderSleepAnalysisService.list(new QueryWrapper<PlatElderSleepAnalysis>().lambda() List<PlatElderSleepAnalysis> sleepAnalysisList = platElderSleepAnalysisService.list(new QueryWrapper<PlatElderSleepAnalysis>().lambda()
.eq(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)
.le(PlatElderSleepAnalysis::getHappenDate, dateTimeFormatter.format(weekEndDate)) .le(PlatElderSleepAnalysis::getHappenDate, dateTimeFormatter.format(weekEndDate))
); );
...@@ -327,15 +330,17 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek ...@@ -327,15 +330,17 @@ 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();
if (StringUtils.isNotEmpty(platElderIdDTO.getDeviceId())) { String deviceId = platElderIdDTO.getDeviceId();
PlatElder platElder = platElderService.getByDeviceId(platElderIdDTO.getDeviceId(), platElderIdDTO.getTenantId()); // if (StringUtils.isNotEmpty(deviceId)) {
if (platElder != null) { // PlatElder platElder = platElderService.getByDeviceId(deviceId, platElderIdDTO.getTenantId());
elderId = platElder.getId(); // if (platElder != null) {
} // elderId = platElder.getId();
} // }
// }
List<PlatElderBreatheAnalysis> breatheAnalyses = platElderBreatheAnalysisService.list(new QueryWrapper<PlatElderBreatheAnalysis>().lambda() List<PlatElderBreatheAnalysis> breatheAnalyses = platElderBreatheAnalysisService.list(new QueryWrapper<PlatElderBreatheAnalysis>().lambda()
.eq(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)
.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