fix: 修复报告bug

server-service/src/main/java/com/makeit/service/platform/device/impl/PlatDeviceServiceImpl.java

@@ -694,10 +694,13 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
             Set<String> newIotDeviceIdSet = Sets.newHashSet(iotDeviceIdSet);
             Set<String> newPlatformDeviceIdSet = Sets.newHashSet(platformDeviceIdList);
 
+            if (CollectionUtils.isEmpty(newIotDeviceIdSet)) {
+                continue;
+            }
             newPlatformDeviceIdSet.removeAll(newIotDeviceIdSet);
-            //iotDeviceIdSet.removeAll(platformDeviceIdList);
 
             if (CollectionUtils.isNotEmpty(newPlatformDeviceIdSet)) {
+                log.info("删除不存在iot的设备:{}",platTenant.getId());
                 List<PlatDevice> platDevices = list(new QueryWrapper<PlatDevice>().lambda().eq(BaseBusEntity::getTenantId, platTenant.getId())
                         .in(PlatDevice::getOriDeviceId, newPlatformDeviceIdSet));
 

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

@@ -345,13 +345,19 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
         );
 
         int score = 0;
+        int br = 0;
+        int hr = 0;
 
         if (CollectionUtils.isNotEmpty(breatheAnalyses)) {
             score = StreamUtil.reduce(breatheAnalyses, e -> Integer.valueOf(e.getBreatheScore() + ""), 0, Integer::sum) / breatheAnalyses.size();
+            br = StreamUtil.reduce(breatheAnalyses, e -> Integer.valueOf(e.getAvgBreatheRate() + ""), 0, Integer::sum) / breatheAnalyses.size();
+            hr = StreamUtil.reduce(breatheAnalyses, e -> Integer.valueOf(e.getAvgHeartRate() + ""), 0, Integer::sum) / breatheAnalyses.size();
         }
 
         PlatElderHeartRespiratoryEvaluationVO platElderHeartRespiratoryEvaluationVO = new PlatElderHeartRespiratoryEvaluationVO();
         platElderHeartRespiratoryEvaluationVO.setScore(score);
+        platElderHeartRespiratoryEvaluationVO.setHeartRate(hr);
+        platElderHeartRespiratoryEvaluationVO.setRespiratoryRate(br);
 
         EvaluateReportVO evaluateReportVO = saasDiseaseReportService.getByScore(platElderHeartRespiratoryEvaluationVO.getScore());
         if (evaluateReportVO != null) {
@@ -412,12 +418,10 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
         }
 
         LambdaQueryWrapper<PlatElderBreatheDayStat> lambdaQueryWrapper = new QueryWrapper<PlatElderBreatheDayStat>().lambda();
-
         lambdaQueryWrapper.ge(PlatElderBreatheDayStat::getDay, weekStartDate);
         lambdaQueryWrapper.le(PlatElderBreatheDayStat::getDay, weekEndDate);
 
         String finalDeviceId = deviceId;
-        //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());
@@ -425,9 +429,6 @@ public class PlatElderDayReportWeekServiceImpl implements PlatElderDayReportWeek
             if (StringUtils.isNotBlank(finalDeviceId)) {
                 qw.or().eq(PlatElderBreatheDayStat::getDeviceId, finalDeviceId);
             }
-//            if (StringUtils.isNotBlank(finalOriDeviceId)) {
-//                qw.or().eq(PlatElderBreatheDayStat::getOriDeviceId, finalOriDeviceId);
-//            }
         });
 
         lambdaQueryWrapper.eq(StringUtils.isNotBlank(platElderIdDTO.getTenantId()), BaseBusEntity::getTenantId,platElderIdDTO.getTenantId());

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

@@ -5,10 +5,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.makeit.dto.platform.elder.PlatElderReportDTO;
 import com.makeit.entity.platform.elder.PlatElderReportMonth;
 import com.makeit.mapper.platform.elder.PlatElderReportMonthMapper;
-import com.makeit.module.iot.service.IotProductDeviceService;
-import com.makeit.service.platform.alarm.PlatAlarmRecordService;
-import com.makeit.service.platform.elder.*;
-import com.makeit.service.saas.PlatTenantService;
+import com.makeit.service.platform.elder.PlatElderDayReportWeekService;
+import com.makeit.service.platform.elder.PlatElderReportMonthService;
 import com.makeit.utils.data.convert.BeanDtoVoUtils;
 import com.makeit.utils.old.StringUtils;
 import com.makeit.utils.time.LocalDateTimeUtils;
@@ -33,27 +31,9 @@ import java.util.List;
 @Service
 public class PlatElderReportMonthServiceImpl extends ServiceImpl<PlatElderReportMonthMapper, PlatElderReportMonth> implements PlatElderReportMonthService {
 
-
-    @Autowired
-    private PlatElderRealTimeService platElderRealTimeService;
-
     @Autowired
     private PlatElderDayReportWeekService platElderDayReportWeekService;
 
-    @Autowired
-    private PlatTenantService platTenantService;
-
-    @Autowired
-    private PlatElderService platElderService;
-
-    @Autowired
-    private PlatElderSleepAnalysisService platElderSleepAnalysisService;
-
-    @Autowired
-    private PlatAlarmRecordService platAlarmRecordService;
-
-    @Autowired
-    private IotProductDeviceService iotProductDeviceService;
 
     public LocalDate monthStartDate(PlatElderReportDTO platElderIdDTO) {
         return monthStartDate(platElderIdDTO.getYear(), platElderIdDTO.getMonth());