From bc1a6bb5bb2803ed6a5669a976bf2b47f3dacfca Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 14 Jan 2026 11:27:28 +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, 26 insertions(+), 2 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 662278f..be0bd93 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,7 @@
 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.FwDefenseZoneVO;
 import org.sxkj.fw.area.excel.FwDefenseZoneExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -29,7 +30,7 @@
  * 防区管理表 Mapper 接口
  *
  * @author lw
- * @since 2026-01-07
+ * @since 2026-01-08
  */
 public interface FwDefenseZoneMapper extends BaseMapper<FwDefenseZoneEntity> {
 
@@ -40,8 +41,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 fwDefenseZone
+	 * @return
+	 */
+	int insertWithGeom(FwDefenseZoneEntity fwDefenseZone);
+
+	/**
+	 * 修改(几何字段使用文本入库)
+	 *
+	 * @param fwDefenseZone
+	 * @return
+	 */
+	int updateWithGeomById(FwDefenseZoneEntity fwDefenseZone);
 
 	/**
 	 * 获取导出数据

--
Gitblit v1.9.3