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/mapper/FwAreaDivideMapper.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 9008e0b..d1d2641 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
@@ -19,6 +19,7 @@
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.param.FwAreaDivideListParam;
import org.sxkj.fw.area.vo.FwAreaDivideVO;
import org.sxkj.fw.area.vo.FwAreaDivideStatisticsVO;
import org.sxkj.fw.area.vo.FwDefenseSceneVO;
@@ -49,15 +50,10 @@
/**
* 列表
*
- * @param filterSelected
- * @param sceneId
+ * @param param
* @return
*/
- 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);
+ List<FwAreaDivideVO> selectFwAreaDivideList(FwAreaDivideListParam param);
/**
* 根据设备ID获取区域
@@ -132,4 +128,17 @@
*/
List<FwAreaDivideExcel> exportFwAreaDivide(@Param("ew") Wrapper<FwAreaDivideEntity> queryWrapper);
+ /**
+ *
+ * @param param
+ * @return
+ */
+ List<FwAreaDivideVO> selectFwAreaDivideListCockpit(FwAreaDivideListParam param);
+
+ /**
+ *
+ * @param areaId
+ * @return
+ */
+ boolean checkAreaBindScene(Long areaId);
}
--
Gitblit v1.9.3