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/area/service/IFwDefenseSceneManageService.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseSceneManageService.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseSceneManageService.java
index fb56a48..10990f5 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseSceneManageService.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwDefenseSceneManageService.java
@@ -23,6 +23,9 @@
 import org.sxkj.fw.area.excel.FwDefenseSceneManageExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+import org.sxkj.fw.common.FwBaseInfo;
+
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -86,4 +89,12 @@
 	 * @return
 	 */
 	List<Long> selectDeviceId(Long sceneManageId);
+
+	/**
+	 *
+	 * @param fwBaseInfo
+	 * @param time
+	 * @return
+	 */
+	List<FwDefenseSceneManageVO> selectFwDefenseSceneManageCockpitList(FwBaseInfo fwBaseInfo, Date time);
 }

--
Gitblit v1.9.3