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/FwDefenseZoneMapper.java |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.java
index 32bfdca..68280d0 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.java
@@ -17,6 +17,8 @@
 package org.sxkj.fw.area.mapper;
 
 import org.sxkj.fw.area.entity.FwDefenseZoneEntity;
+import org.sxkj.fw.area.dto.FwDefenseZoneDTO;
+import org.sxkj.fw.area.vo.FwAreaDivideVO;
 import org.sxkj.fw.area.vo.FwDefenseZoneVO;
 import org.sxkj.fw.area.excel.FwDefenseZoneExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -40,7 +42,31 @@
 	 * @param fwDefenseZone
 	 * @return
 	 */
-	List<FwDefenseZoneVO> selectFwDefenseZonePage(IPage page, FwDefenseZoneVO fwDefenseZone);
+	List<FwDefenseZoneVO> selectFwDefenseZonePage(IPage page, FwDefenseZoneDTO fwDefenseZone);
+
+	/**
+	 * 详情
+	 *
+	 * @param id
+	 * @return
+	 */
+	FwDefenseZoneVO selectFwDefenseZoneDetail(@Param("id") Long id);
+
+	/**
+	 * 校验防区是否存在
+	 *
+	 * @param zoneId
+	 * @return
+	 */
+	Integer selectDefenseZoneExists(@Param("zoneId") Long zoneId);
+
+	/**
+	 * 根据防区id获取区域列表
+	 *
+	 * @param zoneId
+	 * @return
+	 */
+	List<FwAreaDivideVO> selectFwAreaDivideListByZoneId(@Param("zoneId") Long zoneId);
 
 	/**
 	 * 新增(几何字段使用文本入库)

--
Gitblit v1.9.3