From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.java
index 5ab82a1..9008e0b 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.java
@@ -53,7 +53,11 @@
* @param sceneId
* @return
*/
- List<FwAreaDivideVO> selectFwAreaDivideList(@Param("filterSelected") Integer filterSelected, @Param("sceneId") Long sceneId);
+ List<FwAreaDivideVO> selectFwAreaDivideList(@Param("filterSelected") Integer filterSelected,
+ @Param("sceneId") Long sceneId,
+ @Param("areaTypeKeyList") List<String> areaTypeKeyList,
+ @Param("isSetSceneManage") Integer isSetSceneManage,
+ @Param("flyTime") java.time.LocalDateTime flyTime);
/**
* 根据设备ID获取区域
@@ -72,6 +76,14 @@
List<FwDefenseSceneVO> selectFwDefenseSceneListByAreaIds(@Param("areaIds") List<Long> areaIds);
/**
+ * 根据设备ID统计关联区域数量
+ *
+ * @param deviceId
+ * @return
+ */
+ Integer selectAreaCountByDeviceId(@Param("deviceId") Long deviceId);
+
+ /**
* 统计分页
*
* @param page
--
Gitblit v1.9.3