fix: 误报通知失败问题

server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java

@@ -607,7 +607,11 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
         }
         }
         Timestamp timestamp = Timestamp.valueOf(platAlarmRecord.getCreateDate());
         Timestamp timestamp = Timestamp.valueOf(platAlarmRecord.getCreateDate());
         log.info("开始想设备发送误报通知");
         log.info("开始想设备发送误报通知");
-        iotDevicePropertiesOperateService.deviceFunctionAttr(platDevice.getOriDeviceId(),timestamp.getTime());
+        String result = iotDevicePropertiesOperateService.deviceFunctionAttr(platDevice.getOriDeviceId(), timestamp.getTime());
+        if (StringUtils.isNotEmpty(result)) {
+            throw new RuntimeException("发送误报通知失败:" + result);
+        }
+
     }
     }
 
 
     @Override
     @Override

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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.makeit.common.entity.BaseEntity;
 import com.makeit.dto.platform.elder.PlatElderReportDTO;
 import com.makeit.dto.platform.elder.PlatElderReportDTO;
 import com.makeit.entity.platform.alarm.PlatAlarmRecord;
 import com.makeit.entity.platform.alarm.PlatAlarmRecord;
 import com.makeit.entity.platform.alarm.PlatDayDurationRecord;
 import com.makeit.entity.platform.alarm.PlatDayDurationRecord;
@@ -100,6 +101,8 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
         PlatElderSleepAnalysis platElderSleepAnalysis = platElderSleepAnalysisService.getOne(new QueryWrapper<PlatElderSleepAnalysis>().lambda()
         PlatElderSleepAnalysis platElderSleepAnalysis = platElderSleepAnalysisService.getOne(new QueryWrapper<PlatElderSleepAnalysis>().lambda()
                 .eq(PlatElderSleepAnalysis::getElderId, elderId)
                 .eq(PlatElderSleepAnalysis::getElderId, elderId)
                 .eq(PlatElderSleepAnalysis::getHappenDate, nowString)
                 .eq(PlatElderSleepAnalysis::getHappenDate, nowString)
+                .orderByDesc(BaseEntity::getCreateDate)
+                .last("limit 1")
         );
         );
 
 
         if (platElderSleepAnalysis == null) {
         if (platElderSleepAnalysis == null) {