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 |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 50 insertions(+), 3 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 b5a0f9d..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
@@ -17,12 +17,15 @@
 package org.sxkj.fw.area.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import org.sxkj.fw.area.dto.FwDefenseSceneManageDTO;
+import org.sxkj.fw.area.param.FwDefenseSceneManagePageParam;
 import org.sxkj.fw.area.entity.FwDefenseSceneManageEntity;
 import org.sxkj.fw.area.vo.FwDefenseSceneManageVO;
 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;
 
 /**
@@ -36,10 +39,26 @@
 	 * 自定义分页
 	 *
 	 * @param page
-	 * @param fwDefenseSceneManage
+	 * @param fwDefenseSceneManagePageParam
 	 * @return
 	 */
-	IPage<FwDefenseSceneManageVO> selectFwDefenseSceneManagePage(IPage<FwDefenseSceneManageVO> page, FwDefenseSceneManageDTO fwDefenseSceneManage);
+	IPage<FwDefenseSceneManageVO> selectFwDefenseSceneManagePage(IPage<FwDefenseSceneManageVO> page, FwDefenseSceneManagePageParam fwDefenseSceneManagePageParam);
+
+	/**
+	 * 详情
+	 *
+	 * @param id
+	 * @return
+	 */
+	FwDefenseSceneManageVO selectFwDefenseSceneManageDetail(Long id);
+
+	/**
+	 * 列表（按时间过滤有效区间）
+	 *
+	 * @param time
+	 * @return
+	 */
+	List<FwDefenseSceneManageVO> selectFwDefenseSceneManageList(java.util.Date time);
 
 
 	/**
@@ -50,4 +69,32 @@
 	 */
 	List<FwDefenseSceneManageExcel> exportFwDefenseSceneManage(Wrapper<FwDefenseSceneManageEntity> queryWrapper);
 
+	/**
+	 * 新增或修改
+	 * @param convert
+	 * @return
+	 */
+	boolean saveOrUpdateFwDefenseSceneManage(FwDefenseSceneManageEntity convert);
+
+	/**
+	 * 批量删除
+	 * @param longList
+	 * @return
+	 */
+	boolean deleteFwDefenseSceneManage(List<Long> longList);
+
+	/**
+	 * 获取场景管理下的所有设备ID
+	 * @param sceneManageId
+	 * @return
+	 */
+	List<Long> selectDeviceId(Long sceneManageId);
+
+	/**
+	 *
+	 * @param fwBaseInfo
+	 * @param time
+	 * @return
+	 */
+	List<FwDefenseSceneManageVO> selectFwDefenseSceneManageCockpitList(FwBaseInfo fwBaseInfo, Date time);
 }

--
Gitblit v1.9.3