fix:误报bug

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

@@ -563,7 +563,9 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
 
 
         platAlarmRecord.setMisinformationFlag(CommonEnum.YES.getValue());
         platAlarmRecord.setMisinformationFlag(CommonEnum.YES.getValue());
         platAlarmRecord.setStatus(CommonEnum.YES.getValue());
         platAlarmRecord.setStatus(CommonEnum.YES.getValue());
-
+        platAlarmRecord.setDealDate(LocalDateTime.now());
+        CommonUserVO user = CommonUserUtil.getUser();
+        platAlarmRecord.setDealUser(user.getName());
         updateById(platAlarmRecord);
         updateById(platAlarmRecord);
 
 
         // todo 误报结果写入设备
         // todo 误报结果写入设备

server-service/src/main/java/com/makeit/service/platform/dataScreen/impl/DataScreenServiceImpl.java

@@ -245,7 +245,6 @@ public class DataScreenServiceImpl implements DataScreenService {
         List<PlatAlarmRecord> alarmRecords = platAlarmRecordService.list(new QueryWrapper<PlatAlarmRecord>().lambda()
         List<PlatAlarmRecord> alarmRecords = platAlarmRecordService.list(new QueryWrapper<PlatAlarmRecord>().lambda()
                 .between(PlatAlarmRecord::getAlarmDate,dto.getStartTime(),dto.getEndTime())
                 .between(PlatAlarmRecord::getAlarmDate,dto.getStartTime(),dto.getEndTime())
                 .isNotNull(PlatAlarmRecord::getElderIds)
                 .isNotNull(PlatAlarmRecord::getElderIds)
-                .in(PlatAlarmRecord::getMisinformationFlag, CommonEnum.NO.getValue())
                 .in(PlatAlarmRecord::getOrgId, dto.getOrgIds()));
                 .in(PlatAlarmRecord::getOrgId, dto.getOrgIds()));
         long total = alarmRecords.size();
         long total = alarmRecords.size();
         long handledNumber = alarmRecords.stream()
         long handledNumber = alarmRecords.stream()