From dbc7e62be76ff48b26461ffaef9c3fc87be018cb Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 11 Feb 2026 11:05:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/ICockpitService.java |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 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 f190217..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.cockpit.vo.SceneManageStatisticsVO;
 import org.sxkj.fw.detection.param.FwEffectEvalParam;
 import org.sxkj.fw.device.dto.FwDeviceDTO;
 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 {
@@ -47,4 +52,37 @@
 	 * @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