From 8d5b8a8c1909be6cdca5228a01bdc017b85a4078 Mon Sep 17 00:00:00 2001 From: rain <1679827795@qq.com> Date: Wed, 21 Jan 2026 15:37:17 +0800 Subject: [PATCH] 处理Vo继承entity问题 --- drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/ICockpitService.java | 10 +++++----- 1 files changed, 5 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..f190217 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,10 +37,10 @@ /** * 评估结果保存 - * @param fwEffectEvalEntity + * @param fwEffectEvalParam * @return */ - boolean saveOrUpdate(FwEffectEvalEntity fwEffectEvalEntity); + boolean interferenceAndExpulsion(FwEffectEvalParam fwEffectEvalParam); /** * 告警记录和设备记录统计 -- Gitblit v1.9.3