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 |    9 +++++++++
 1 files changed, 9 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 e8dceb2..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
@@ -5,6 +5,7 @@
 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;
@@ -76,4 +77,12 @@
 	 * @return
 	 */
 	List<FwDefenseSceneManageVO> selectFwDefenseSceneManageList(Date filterTime);
+
+	/**
+	 * 场景管理与区域数量统计
+	 *
+	 * @param filterTime 过滤时间
+	 * @return
+	 */
+	SceneManageStatisticsVO statisticsSceneManageAndArea(Date filterTime);
 }

--
Gitblit v1.9.3