From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwAreaDivideService.java |   37 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 36 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwAreaDivideService.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwAreaDivideService.java
index be9a645..dd020e0 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwAreaDivideService.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwAreaDivideService.java
@@ -20,12 +20,15 @@
 import org.sxkj.fw.area.dto.FwAreaDivideDTO;
 import org.sxkj.fw.area.dto.FwAreaDivideStatisticsDTO;
 import org.sxkj.fw.area.entity.FwAreaDivideEntity;
+import org.sxkj.fw.area.entity.FwAreaDivideExtEntity;
+import org.sxkj.fw.area.param.FwAreaDivideListParam;
 import org.sxkj.fw.area.vo.FwAreaDivideVO;
 import org.sxkj.fw.area.vo.FwAreaDivideStatisticsVO;
 import org.sxkj.fw.area.excel.FwAreaDivideExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 区域划分表 服务类
@@ -50,7 +53,23 @@
 	 * @param sceneId
 	 * @return
 	 */
-	List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected, Long sceneId);
+	List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected, Long sceneId, String areaTypeKeys, Integer isSetSceneManage, java.time.LocalDateTime flyTime);
+
+	/**
+	 * 根据设备ID获取关联场景名称
+	 *
+	 * @param deviceIds
+	 * @return
+	 */
+	Map<Long, String> selectSceneNameByDeviceIds(List<Long> deviceIds);
+
+	/**
+	 * 根据设备ID判断是否绑定区域
+	 *
+	 * @param deviceId
+	 * @return
+	 */
+	boolean existsAreaByDeviceId(Long deviceId);
 
 	/**
 	 * 统计分页
@@ -85,4 +104,20 @@
 	 */
 	List<FwAreaDivideExcel> exportFwAreaDivide(Wrapper<FwAreaDivideEntity> queryWrapper);
 
+	/**
+	 * 新增或修改（主表 + 扩展表批量）
+	 *
+	 * @param fwAreaDivide
+	 * @param fwAreaDivideExtList
+	 * @return
+	 */
+	boolean saveOrUpdateWithExt(FwAreaDivideEntity fwAreaDivide, List<FwAreaDivideExtEntity> fwAreaDivideExtList);
+
+	/**
+	 *
+	 * @param param
+	 * @return
+	 */
+	List<FwAreaDivideVO> selectFwAreaDivideList(FwAreaDivideListParam param);
+
 }

--
Gitblit v1.9.3