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 | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 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 a7d0c9f..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
@@ -21,6 +21,7 @@
import org.sxkj.fw.area.entity.FwAreaDivideEntity;
import org.sxkj.fw.area.vo.FwAreaDivideVO;
import org.sxkj.fw.area.vo.FwAreaDivideStatisticsVO;
+import org.sxkj.fw.area.vo.FwDefenseSceneVO;
import org.sxkj.fw.area.excel.FwAreaDivideExcel;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -49,9 +50,38 @@
* 列表
*
* @param filterSelected
+ * @param sceneId
* @return
*/
- List<FwAreaDivideVO> selectFwAreaDivideList(@Param("filterSelected") Integer filterSelected);
+ 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获取区域
+ *
+ * @param deviceIds
+ * @return
+ */
+ List<FwAreaDivideVO> selectFwAreaDivideListByDeviceIds(@Param("deviceIds") List<Long> deviceIds);
+
+ /**
+ * 根据区域ID获取场景
+ *
+ * @param areaIds
+ * @return
+ */
+ List<FwDefenseSceneVO> selectFwDefenseSceneListByAreaIds(@Param("areaIds") List<Long> areaIds);
+
+ /**
+ * 根据设备ID统计关联区域数量
+ *
+ * @param deviceId
+ * @return
+ */
+ Integer selectAreaCountByDeviceId(@Param("deviceId") Long deviceId);
/**
* 统计分页
--
Gitblit v1.9.3