From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001 From: linwei <872216696@qq.com> Date: Mon, 02 Feb 2026 18:18:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/ICockpitService.java | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/ICockpitService.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/ICockpitService.java index 5a4568d..fd412cb 100644 --- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/ICockpitService.java +++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/ICockpitService.java @@ -3,9 +3,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.sxkj.fw.cockpit.vo.AlarmStatisticsVO; import org.sxkj.fw.cockpit.vo.DeviceStatisticsVO; -import org.sxkj.fw.detection.entity.FwEffectEvalEntity; +import org.sxkj.fw.detection.param.FwEffectEvalParam; import org.sxkj.fw.device.dto.FwDeviceDTO; -import org.sxkj.fw.device.entity.FwDeviceEntity; +import org.sxkj.fw.device.vo.CockpitFwDeviceVO; import org.sxkj.fw.record.dto.FwDroneAlarmRecordDTO; import org.sxkj.fw.record.vo.FwDroneAlarmRecordVO; @@ -27,7 +27,7 @@ * @param fwDevice * @return */ - IPage<FwDeviceEntity> selectFwDevicePage(IPage<FwDeviceEntity> page, FwDeviceDTO fwDevice); + IPage<CockpitFwDeviceVO> selectCockpitDevicePage(IPage<CockpitFwDeviceVO> page, FwDeviceDTO fwDevice); /** * 设备类型统计 @@ -37,14 +37,21 @@ /** * 评估结果保存 - * @param fwEffectEvalEntity + * @param fwEffectEvalParam * @return */ - boolean saveOrUpdate(FwEffectEvalEntity fwEffectEvalEntity); + boolean interferenceAndExpulsion(FwEffectEvalParam fwEffectEvalParam); /** * 告警记录和设备记录统计 * @return */ AlarmStatisticsVO statisticsAlarmsAndDeviceRecords(); + + /** + * + * @param effectiveRangeKmIsNotNull + * @return + */ + List<DeviceStatisticsVO> getDeviceOutStatistics(String effectiveRangeKmIsNotNull); } -- Gitblit v1.9.3