From 51a551a7f8eae7654f973d45cd2fa2952774673d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 07 Aug 2026 10:56:55 +0800
Subject: [PATCH] perf(task): 优化巡查任务审核性能并添加详细日志记录
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/ICockpitService.java | 48 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 43 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..44279f7 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
@@ -1,14 +1,19 @@
package org.sxkj.fw.cockpit.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.sxkj.fw.area.vo.FwAreaDivideVO;
+import org.sxkj.fw.area.vo.FwDefenseSceneManageVO;
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.cockpit.vo.SceneManageStatisticsVO;
+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;
+import java.time.LocalDateTime;
+import java.util.Date;
import java.util.List;
public interface ICockpitService {
@@ -27,7 +32,7 @@
* @param fwDevice
* @return
*/
- IPage<FwDeviceEntity> selectFwDevicePage(IPage<FwDeviceEntity> page, FwDeviceDTO fwDevice);
+ IPage<CockpitFwDeviceVO> selectCockpitDevicePage(IPage<CockpitFwDeviceVO> page, FwDeviceDTO fwDevice);
/**
* 设备类型统计
@@ -37,14 +42,47 @@
/**
* 评估结果保存
- * @param fwEffectEvalEntity
+ * @param fwEffectEvalParam
* @return
*/
- boolean saveOrUpdate(FwEffectEvalEntity fwEffectEvalEntity);
+ boolean interferenceAndExpulsion(FwEffectEvalParam fwEffectEvalParam);
/**
* 告警记录和设备记录统计
* @return
*/
AlarmStatisticsVO statisticsAlarmsAndDeviceRecords();
+
+ /**
+ *
+ * @param effectiveRangeKmIsNotNull
+ * @return
+ */
+ List<DeviceStatisticsVO> getDeviceOutStatistics(String effectiveRangeKmIsNotNull);
+
+ /**
+ *
+ * @param filterSelected
+ * @param sceneId
+ * @param areaTypeKeys
+ * @param isSetSceneManage
+ * @param flyTime
+ * @return
+ */
+ List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected, Long sceneId, String areaTypeKeys, Integer isSetSceneManage, LocalDateTime flyTime);
+
+ /**
+ *
+ * @param filterTime
+ * @return
+ */
+ List<FwDefenseSceneManageVO> selectFwDefenseSceneManageList(Date filterTime);
+
+ /**
+ * 场景管理与区域数量统计
+ *
+ * @param filterTime 过滤时间
+ * @return
+ */
+ SceneManageStatisticsVO statisticsSceneManageAndArea(Date filterTime);
}
--
Gitblit v1.9.3