From 9a43b7222c3049c9b09ff369bfb0da6c2bcad4c2 Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Fri, 5 Sep 2025 08:39:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=86=99=20=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/TGisCjqyController.java          | 20 ++--
 .../business/TGisXjqyController.java          | 20 ++--
 .../business/TGisXjxzqController.java         | 20 ++--
 .../com/ruoyi/business/domain/TGisCjqy.java   | 55 +++++------
 .../com/ruoyi/business/domain/TGisXjqy.java   | 51 +++++-----
 .../com/ruoyi/business/domain/TGisXjxzq.java  | 51 +++++-----
 .../ruoyi/business/mapper/TGisCjqyMapper.java | 14 +--
 .../ruoyi/business/mapper/TGisXjqyMapper.java | 14 +--
 .../business/mapper/TGisXjxzqMapper.java      | 14 +--
 .../business/service/ITGisCjqyService.java    | 14 +--
 .../business/service/ITGisXjqyService.java    | 14 +--
 .../business/service/ITGisXjxzqService.java   | 14 +--
 .../service/impl/TGisCjqyServiceImpl.java     | 22 ++---
 .../service/impl/TGisXjqyServiceImpl.java     | 24 +++--
 .../service/impl/TGisXjxzqServiceImpl.java    | 22 ++---
 .../mapper/business/TGisCjqyMapper.xml        | 91 ++++++++---------
 .../mapper/business/TGisXjqyMapper.xml        | 99 +++++++++----------
 .../mapper/business/TGisXjxzqMapper.xml       | 99 +++++++++----------
 18 files changed, 319 insertions(+), 339 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/TGisCjqyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/TGisCjqyController.java
index fd47b3f..7733541 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/TGisCjqyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/TGisCjqyController.java
@@ -26,7 +26,7 @@ import java.util.List;
  * 村级区域Controller
  *
  * @author rongxin
- * @date 2025-09-04
+ * @date 2025-09-05
  */
 @RestController
 @RequestMapping("/business/cjqy")
@@ -87,20 +87,20 @@ public class TGisCjqyController extends BaseController
      * 获取村级区域详细信息
      */
     @PreAuthorize("@ss.hasPermi('business:cjqy:query')")
-    @GetMapping(value = "/{CJQYDM}")
-    public AjaxResult getInfo(@PathVariable("CJQYDM") String CJQYDM)
+    @GetMapping(value = "/{fid}")
+    public AjaxResult getInfo(@PathVariable("fid") Long fid)
     {
-        return success(tGisCjqyService.selectTGisCjqyByCJQYDM(CJQYDM));
+        return success(tGisCjqyService.selectTGisCjqyByFid(fid));
     }
 
     /**
      * 获取村级区域详细信息,翻译字典
      */
     @PreAuthorize("@ss.hasPermi('business:cjqy:query')")
-    @GetMapping(value = "/detail/{CJQYDM}")
-    public AjaxResult detail(@PathVariable("CJQYDM") String CJQYDM)
+    @GetMapping(value = "/detail/{fid}")
+    public AjaxResult detail(@PathVariable("fid") Long fid)
     {
-        TGisCjqy detail = tGisCjqyService.selectTGisCjqyByCJQYDM(CJQYDM);
+        TGisCjqy detail = tGisCjqyService.selectTGisCjqyByFid(fid);
         TranslateUtils.translate(detail, false);
         return success(detail);
     }
@@ -132,10 +132,10 @@ public class TGisCjqyController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('business:cjqy:remove')")
     @Log(title = "村级区域", businessType = BusinessType.DELETE)
-	@GetMapping("/delete/{CJQYDMs}")
-    public AjaxResult remove(@PathVariable String[] CJQYDMs)
+	@GetMapping("/delete/{fids}")
+    public AjaxResult remove(@PathVariable Long[] fids)
     {
-        return toAjax(tGisCjqyService.deleteTGisCjqyByCJQYDMs(CJQYDMs));
+        return toAjax(tGisCjqyService.deleteTGisCjqyByFids(fids));
     }
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/TGisXjqyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/TGisXjqyController.java
index 938c155..146d2b4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/TGisXjqyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/TGisXjqyController.java
@@ -26,7 +26,7 @@ import java.util.List;
  * 乡级区域Controller
  *
  * @author rongxin
- * @date 2025-09-04
+ * @date 2025-09-05
  */
 @RestController
 @RequestMapping("/business/xjqy")
@@ -87,20 +87,20 @@ public class TGisXjqyController extends BaseController
      * 获取乡级区域详细信息
      */
     @PreAuthorize("@ss.hasPermi('business:xjqy:query')")
-    @GetMapping(value = "/{XJQYDM}")
-    public AjaxResult getInfo(@PathVariable("XJQYDM") String XJQYDM)
+    @GetMapping(value = "/{fid}")
+    public AjaxResult getInfo(@PathVariable("fid") Long fid)
     {
-        return success(tGisXjqyService.selectTGisXjqyByXJQYDM(XJQYDM));
+        return success(tGisXjqyService.selectTGisXjqyByFid(fid));
     }
 
     /**
      * 获取乡级区域详细信息,翻译字典
      */
     @PreAuthorize("@ss.hasPermi('business:xjqy:query')")
-    @GetMapping(value = "/detail/{XJQYDM}")
-    public AjaxResult detail(@PathVariable("XJQYDM") String XJQYDM)
+    @GetMapping(value = "/detail/{fid}")
+    public AjaxResult detail(@PathVariable("fid") Long fid)
     {
-        TGisXjqy detail = tGisXjqyService.selectTGisXjqyByXJQYDM(XJQYDM);
+        TGisXjqy detail = tGisXjqyService.selectTGisXjqyByFid(fid);
         TranslateUtils.translate(detail, false);
         return success(detail);
     }
@@ -132,10 +132,10 @@ public class TGisXjqyController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('business:xjqy:remove')")
     @Log(title = "乡级区域", businessType = BusinessType.DELETE)
-	@GetMapping("/delete/{XJQYDMs}")
-    public AjaxResult remove(@PathVariable String[] XJQYDMs)
+	@GetMapping("/delete/{fids}")
+    public AjaxResult remove(@PathVariable Long[] fids)
     {
-        return toAjax(tGisXjqyService.deleteTGisXjqyByXJQYDMs(XJQYDMs));
+        return toAjax(tGisXjqyService.deleteTGisXjqyByFids(fids));
     }
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/TGisXjxzqController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/TGisXjxzqController.java
index 2c2d5d8..bc46133 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/TGisXjxzqController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/business/TGisXjxzqController.java
@@ -26,7 +26,7 @@ import java.util.List;
  * 县级区域Controller
  *
  * @author rongxin
- * @date 2025-09-04
+ * @date 2025-09-05
  */
 @RestController
 @RequestMapping("/business/xjxzq")
@@ -87,20 +87,20 @@ public class TGisXjxzqController extends BaseController
      * 获取县级区域详细信息
      */
     @PreAuthorize("@ss.hasPermi('business:xjxzq:query')")
-    @GetMapping(value = "/{XZQDM}")
-    public AjaxResult getInfo(@PathVariable("XZQDM") String XZQDM)
+    @GetMapping(value = "/{fid}")
+    public AjaxResult getInfo(@PathVariable("fid") Long fid)
     {
-        return success(tGisXjxzqService.selectTGisXjxzqByXZQDM(XZQDM));
+        return success(tGisXjxzqService.selectTGisXjxzqByFid(fid));
     }
 
     /**
      * 获取县级区域详细信息,翻译字典
      */
     @PreAuthorize("@ss.hasPermi('business:xjxzq:query')")
-    @GetMapping(value = "/detail/{XZQDM}")
-    public AjaxResult detail(@PathVariable("XZQDM") String XZQDM)
+    @GetMapping(value = "/detail/{fid}")
+    public AjaxResult detail(@PathVariable("fid") Long fid)
     {
-        TGisXjxzq detail = tGisXjxzqService.selectTGisXjxzqByXZQDM(XZQDM);
+        TGisXjxzq detail = tGisXjxzqService.selectTGisXjxzqByFid(fid);
         TranslateUtils.translate(detail, false);
         return success(detail);
     }
@@ -132,10 +132,10 @@ public class TGisXjxzqController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('business:xjxzq:remove')")
     @Log(title = "县级区域", businessType = BusinessType.DELETE)
-	@GetMapping("/delete/{XZQDMs}")
-    public AjaxResult remove(@PathVariable String[] XZQDMs)
+	@GetMapping("/delete/{fids}")
+    public AjaxResult remove(@PathVariable Long[] fids)
     {
-        return toAjax(tGisXjxzqService.deleteTGisXjxzqByXZQDMs(XZQDMs));
+        return toAjax(tGisXjxzqService.deleteTGisXjxzqByFids(fids));
     }
 
     /**
diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/domain/TGisCjqy.java b/ruoyi-business/src/main/java/com/ruoyi/business/domain/TGisCjqy.java
index c7c45fe..b2c65c5 100644
--- a/ruoyi-business/src/main/java/com/ruoyi/business/domain/TGisCjqy.java
+++ b/ruoyi-business/src/main/java/com/ruoyi/business/domain/TGisCjqy.java
@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 村级区域对象 t_gis_cjqy
  * 
  * @author rongxin
- * @date 2025-09-04
+ * @date 2025-09-05
  */
 public class TGisCjqy extends BaseEntity
 {
@@ -17,69 +17,68 @@ public class TGisCjqy extends BaseEntity
 
     /** 区划代码 */
     @Excel(name = "区划代码")
-    private String CJQYDM;
+    private String cjqydm;
 
     /** 区划名称 */
     @Excel(name = "区划名称")
-    private String CJQYMC;
+    private String cjqymc;
 
     /** 标识码 */
     @Excel(name = "标识码")
-    private Long BSM;
+    private Long bsm;
 
     /** 要素代码 */
     @Excel(name = "要素代码")
-    private String YSDM;
+    private String ysdm;
 
     /** 空间矢量 */
     private String theGeom;
 
-    /** 级联代码 */
-    @Excel(name = "级联代码")
+    /** 部门级联代码 */
+    @Excel(name = "部门级联代码")
     private String importCode;
 
     /** fid */
-    @Excel(name = "fid")
     private Long fid;
 
-    public void setCJQYDM(String CJQYDM) 
+    public void setCjqydm(String cjqydm) 
     {
-        this.CJQYDM = CJQYDM;
+        this.cjqydm = cjqydm;
     }
 
-    public String getCJQYDM() 
+    public String getCjqydm() 
     {
-        return CJQYDM;
+        return cjqydm;
     }
 
-    public void setCJQYMC(String CJQYMC) 
+    public void setCjqymc(String cjqymc) 
     {
-        this.CJQYMC = CJQYMC;
+        this.cjqymc = cjqymc;
     }
 
-    public String getCJQYMC() 
+    public String getCjqymc() 
     {
-        return CJQYMC;
+        return cjqymc;
     }
 
-    public void setBSM(Long BSM) 
+    public void setBsm(Long bsm) 
     {
-        this.BSM = BSM;
+        this.bsm = bsm;
     }
 
-    public Long getBSM() 
+    public Long getBsm() 
     {
-        return BSM;
+        return bsm;
     }
 
-    public void setYSDM(String YSDM) 
+    public void setYsdm(String ysdm) 
     {
-        this.YSDM = YSDM;
+        this.ysdm = ysdm;
     }
 
-    public String getYSDM() 
+    public String getYsdm() 
     {
-        return YSDM;
+        return ysdm;
     }
 
     public void setTheGeom(String theGeom) 
@@ -115,10 +114,10 @@ public class TGisCjqy extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("CJQYDM", getCJQYDM())
-            .append("CJQYMC", getCJQYMC())
-            .append("BSM", getBSM())
-            .append("YSDM", getYSDM())
+            .append("cjqydm", getCjqydm())
+            .append("cjqymc", getCjqymc())
+            .append("bsm", getBsm())
+            .append("ysdm", getYsdm())
             .append("theGeom", getTheGeom())
             .append("importCode", getImportCode())
             .append("fid", getFid())
diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/domain/TGisXjqy.java b/ruoyi-business/src/main/java/com/ruoyi/business/domain/TGisXjqy.java
index 0af6b46..53f4f0a 100644
--- a/ruoyi-business/src/main/java/com/ruoyi/business/domain/TGisXjqy.java
+++ b/ruoyi-business/src/main/java/com/ruoyi/business/domain/TGisXjqy.java
@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 乡级区域对象 t_gis_xjqy
  * 
  * @author rongxin
- * @date 2025-09-04
+ * @date 2025-09-05
  */
 public class TGisXjqy extends BaseEntity
 {
@@ -17,19 +17,19 @@ public class TGisXjqy extends BaseEntity
 
     /** 区划代码 */
     @Excel(name = "区划代码")
-    private String XJQYDM;
+    private String xjqydm;
 
     /** 区划名称 */
     @Excel(name = "区划名称")
-    private String XJQYMC;
+    private String xjqymc;
 
     /** 标识码 */
     @Excel(name = "标识码")
-    private Long BSM;
+    private Long bsm;
 
     /** 要素代码 */
     @Excel(name = "要素代码")
-    private String YSDM;
+    private String ysdm;
 
     /** 空间矢量 */
     private String theGeom;
@@ -39,47 +39,46 @@ public class TGisXjqy extends BaseEntity
     private String importCode;
 
     /** fid */
-    @Excel(name = "fid")
     private Long fid;
 
-    public void setXJQYDM(String XJQYDM) 
+    public void setXjqydm(String xjqydm) 
     {
-        this.XJQYDM = XJQYDM;
+        this.xjqydm = xjqydm;
     }
 
-    public String getXJQYDM() 
+    public String getXjqydm() 
     {
-        return XJQYDM;
+        return xjqydm;
     }
 
-    public void setXJQYMC(String XJQYMC) 
+    public void setXjqymc(String xjqymc) 
     {
-        this.XJQYMC = XJQYMC;
+        this.xjqymc = xjqymc;
     }
 
-    public String getXJQYMC() 
+    public String getXjqymc() 
     {
-        return XJQYMC;
+        return xjqymc;
     }
 
-    public void setBSM(Long BSM) 
+    public void setBsm(Long bsm) 
     {
-        this.BSM = BSM;
+        this.bsm = bsm;
     }
 
-    public Long getBSM() 
+    public Long getBsm() 
     {
-        return BSM;
+        return bsm;
     }
 
-    public void setYSDM(String YSDM) 
+    public void setYsdm(String ysdm) 
     {
-        this.YSDM = YSDM;
+        this.ysdm = ysdm;
     }
 
-    public String getYSDM() 
+    public String getYsdm() 
     {
-        return YSDM;
+        return ysdm;
     }
 
     public void setTheGeom(String theGeom) 
@@ -115,10 +114,10 @@ public class TGisXjqy extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("XJQYDM", getXJQYDM())
-            .append("XJQYMC", getXJQYMC())
-            .append("BSM", getBSM())
-            .append("YSDM", getYSDM())
+            .append("xjqydm", getXjqydm())
+            .append("xjqymc", getXjqymc())
+            .append("bsm", getBsm())
+            .append("ysdm", getYsdm())
             .append("theGeom", getTheGeom())
             .append("importCode", getImportCode())
             .append("fid", getFid())
diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/domain/TGisXjxzq.java b/ruoyi-business/src/main/java/com/ruoyi/business/domain/TGisXjxzq.java
index 76878ab..11524f6 100644
--- a/ruoyi-business/src/main/java/com/ruoyi/business/domain/TGisXjxzq.java
+++ b/ruoyi-business/src/main/java/com/ruoyi/business/domain/TGisXjxzq.java
@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 县级区域对象 t_gis_xjxzq
  * 
  * @author rongxin
- * @date 2025-09-04
+ * @date 2025-09-05
  */
 public class TGisXjxzq extends BaseEntity
 {
@@ -17,19 +17,19 @@ public class TGisXjxzq extends BaseEntity
 
     /** 区划代码 */
     @Excel(name = "区划代码")
-    private String XZQDM;
+    private String xzqdm;
 
     /** 区划名称 */
     @Excel(name = "区划名称")
-    private String XZQMC;
+    private String xzqmc;
 
     /** 标识码 */
     @Excel(name = "标识码")
-    private Long BSM;
+    private Long bsm;
 
     /** 要素代码 */
     @Excel(name = "要素代码")
-    private String YSDM;
+    private String ysdm;
 
     /** 空间矢量 */
     private String theGeom;
@@ -39,47 +39,46 @@ public class TGisXjxzq extends BaseEntity
     private String importCode;
 
     /** fid */
-    @Excel(name = "fid")
     private Long fid;
 
-    public void setXZQDM(String XZQDM) 
+    public void setXzqdm(String xzqdm) 
     {
-        this.XZQDM = XZQDM;
+        this.xzqdm = xzqdm;
     }
 
-    public String getXZQDM() 
+    public String getXzqdm() 
     {
-        return XZQDM;
+        return xzqdm;
     }
 
-    public void setXZQMC(String XZQMC) 
+    public void setXzqmc(String xzqmc) 
     {
-        this.XZQMC = XZQMC;
+        this.xzqmc = xzqmc;
     }
 
-    public String getXZQMC() 
+    public String getXzqmc() 
     {
-        return XZQMC;
+        return xzqmc;
     }
 
-    public void setBSM(Long BSM) 
+    public void setBsm(Long bsm) 
     {
-        this.BSM = BSM;
+        this.bsm = bsm;
     }
 
-    public Long getBSM() 
+    public Long getBsm() 
     {
-        return BSM;
+        return bsm;
     }
 
-    public void setYSDM(String YSDM) 
+    public void setYsdm(String ysdm) 
     {
-        this.YSDM = YSDM;
+        this.ysdm = ysdm;
     }
 
-    public String getYSDM() 
+    public String getYsdm() 
     {
-        return YSDM;
+        return ysdm;
     }
 
     public void setTheGeom(String theGeom) 
@@ -115,10 +114,10 @@ public class TGisXjxzq extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("XZQDM", getXZQDM())
-            .append("XZQMC", getXZQMC())
-            .append("BSM", getBSM())
-            .append("YSDM", getYSDM())
+            .append("xzqdm", getXzqdm())
+            .append("xzqmc", getXzqmc())
+            .append("bsm", getBsm())
+            .append("ysdm", getYsdm())
             .append("theGeom", getTheGeom())
             .append("importCode", getImportCode())
             .append("fid", getFid())
diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/mapper/TGisCjqyMapper.java b/ruoyi-business/src/main/java/com/ruoyi/business/mapper/TGisCjqyMapper.java
index f22958a..9f4852e 100644
--- a/ruoyi-business/src/main/java/com/ruoyi/business/mapper/TGisCjqyMapper.java
+++ b/ruoyi-business/src/main/java/com/ruoyi/business/mapper/TGisCjqyMapper.java
@@ -7,17 +7,17 @@ import com.ruoyi.business.domain.TGisCjqy;
  * 村级区域Mapper接口
  *
  * @author rongxin
- * @date 2025-09-04
+ * @date 2025-09-05
  */
 public interface TGisCjqyMapper
 {
     /**
      * 查询村级区域
      *
-     * @param CJQYDM 村级区域主键
+     * @param fid 村级区域主键
      * @return 村级区域
      */
-    public TGisCjqy selectTGisCjqyByCJQYDM(String CJQYDM);
+    public TGisCjqy selectTGisCjqyByFid(Long fid);
 
     /**
      * 查询村级区域列表
@@ -62,16 +62,16 @@ public interface TGisCjqyMapper
     /**
      * 删除村级区域
      *
-     * @param CJQYDM 村级区域主键
+     * @param fid 村级区域主键
      * @return 结果
      */
-    public int deleteTGisCjqyByCJQYDM(String CJQYDM);
+    public int deleteTGisCjqyByFid(Long fid);
 
     /**
      * 批量删除村级区域
      *
-     * @param CJQYDMs 需要删除的数据主键集合
+     * @param fids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteTGisCjqyByCJQYDMs(String[] CJQYDMs);
+    public int deleteTGisCjqyByFids(Long[] fids);
 }
diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/mapper/TGisXjqyMapper.java b/ruoyi-business/src/main/java/com/ruoyi/business/mapper/TGisXjqyMapper.java
index 4949ef3..5627b5a 100644
--- a/ruoyi-business/src/main/java/com/ruoyi/business/mapper/TGisXjqyMapper.java
+++ b/ruoyi-business/src/main/java/com/ruoyi/business/mapper/TGisXjqyMapper.java
@@ -7,17 +7,17 @@ import com.ruoyi.business.domain.TGisXjqy;
  * 乡级区域Mapper接口
  *
  * @author rongxin
- * @date 2025-09-04
+ * @date 2025-09-05
  */
 public interface TGisXjqyMapper
 {
     /**
      * 查询乡级区域
      *
-     * @param XJQYDM 乡级区域主键
+     * @param fid 乡级区域主键
      * @return 乡级区域
      */
-    public TGisXjqy selectTGisXjqyByXJQYDM(String XJQYDM);
+    public TGisXjqy selectTGisXjqyByFid(Long fid);
 
     /**
      * 查询乡级区域列表
@@ -62,16 +62,16 @@ public interface TGisXjqyMapper
     /**
      * 删除乡级区域
      *
-     * @param XJQYDM 乡级区域主键
+     * @param fid 乡级区域主键
      * @return 结果
      */
-    public int deleteTGisXjqyByXJQYDM(String XJQYDM);
+    public int deleteTGisXjqyByFid(Long fid);
 
     /**
      * 批量删除乡级区域
      *
-     * @param XJQYDMs 需要删除的数据主键集合
+     * @param fids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteTGisXjqyByXJQYDMs(String[] XJQYDMs);
+    public int deleteTGisXjqyByFids(Long[] fids);
 }
diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/mapper/TGisXjxzqMapper.java b/ruoyi-business/src/main/java/com/ruoyi/business/mapper/TGisXjxzqMapper.java
index 3114e24..e8403ef 100644
--- a/ruoyi-business/src/main/java/com/ruoyi/business/mapper/TGisXjxzqMapper.java
+++ b/ruoyi-business/src/main/java/com/ruoyi/business/mapper/TGisXjxzqMapper.java
@@ -7,17 +7,17 @@ import com.ruoyi.business.domain.TGisXjxzq;
  * 县级区域Mapper接口
  *
  * @author rongxin
- * @date 2025-09-04
+ * @date 2025-09-05
  */
 public interface TGisXjxzqMapper
 {
     /**
      * 查询县级区域
      *
-     * @param XZQDM 县级区域主键
+     * @param fid 县级区域主键
      * @return 县级区域
      */
-    public TGisXjxzq selectTGisXjxzqByXZQDM(String XZQDM);
+    public TGisXjxzq selectTGisXjxzqByFid(Long fid);
 
     /**
      * 查询县级区域列表
@@ -62,16 +62,16 @@ public interface TGisXjxzqMapper
     /**
      * 删除县级区域
      *
-     * @param XZQDM 县级区域主键
+     * @param fid 县级区域主键
      * @return 结果
      */
-    public int deleteTGisXjxzqByXZQDM(String XZQDM);
+    public int deleteTGisXjxzqByFid(Long fid);
 
     /**
      * 批量删除县级区域
      *
-     * @param XZQDMs 需要删除的数据主键集合
+     * @param fids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteTGisXjxzqByXZQDMs(String[] XZQDMs);
+    public int deleteTGisXjxzqByFids(Long[] fids);
 }
diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/ITGisCjqyService.java b/ruoyi-business/src/main/java/com/ruoyi/business/service/ITGisCjqyService.java
index 61e92ed..36c014e 100644
--- a/ruoyi-business/src/main/java/com/ruoyi/business/service/ITGisCjqyService.java
+++ b/ruoyi-business/src/main/java/com/ruoyi/business/service/ITGisCjqyService.java
@@ -7,17 +7,17 @@ import com.ruoyi.business.domain.TGisCjqy;
  * 村级区域Service接口
  *
  * @author rongxin
- * @date 2025-09-04
+ * @date 2025-09-05
  */
 public interface ITGisCjqyService
 {
     /**
      * 查询村级区域
      *
-     * @param CJQYDM 村级区域主键
+     * @param fid 村级区域主键
      * @return 村级区域
      */
-    public TGisCjqy selectTGisCjqyByCJQYDM(String CJQYDM);
+    public TGisCjqy selectTGisCjqyByFid(Long fid);
 
     /**
      * 查询村级区域列表
@@ -72,16 +72,16 @@ public interface ITGisCjqyService
     /**
      * 批量删除村级区域
      *
-     * @param CJQYDMs 需要删除的村级区域主键集合
+     * @param fids 需要删除的村级区域主键集合
      * @return 结果
      */
-    public int deleteTGisCjqyByCJQYDMs(String[] CJQYDMs);
+    public int deleteTGisCjqyByFids(Long[] fids);
 
     /**
      * 删除村级区域信息
      *
-     * @param CJQYDM 村级区域主键
+     * @param fid 村级区域主键
      * @return 结果
      */
-    public int deleteTGisCjqyByCJQYDM(String CJQYDM);
+    public int deleteTGisCjqyByFid(Long fid);
 }
diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/ITGisXjqyService.java b/ruoyi-business/src/main/java/com/ruoyi/business/service/ITGisXjqyService.java
index 864fc29..3c6e9c9 100644
--- a/ruoyi-business/src/main/java/com/ruoyi/business/service/ITGisXjqyService.java
+++ b/ruoyi-business/src/main/java/com/ruoyi/business/service/ITGisXjqyService.java
@@ -7,17 +7,17 @@ import com.ruoyi.business.domain.TGisXjqy;
  * 乡级区域Service接口
  *
  * @author rongxin
- * @date 2025-09-04
+ * @date 2025-09-05
  */
 public interface ITGisXjqyService
 {
     /**
      * 查询乡级区域
      *
-     * @param XJQYDM 乡级区域主键
+     * @param fid 乡级区域主键
      * @return 乡级区域
      */
-    public TGisXjqy selectTGisXjqyByXJQYDM(String XJQYDM);
+    public TGisXjqy selectTGisXjqyByFid(Long fid);
 
     /**
      * 查询乡级区域列表
@@ -72,16 +72,16 @@ public interface ITGisXjqyService
     /**
      * 批量删除乡级区域
      *
-     * @param XJQYDMs 需要删除的乡级区域主键集合
+     * @param fids 需要删除的乡级区域主键集合
      * @return 结果
      */
-    public int deleteTGisXjqyByXJQYDMs(String[] XJQYDMs);
+    public int deleteTGisXjqyByFids(Long[] fids);
 
     /**
      * 删除乡级区域信息
      *
-     * @param XJQYDM 乡级区域主键
+     * @param fid 乡级区域主键
      * @return 结果
      */
-    public int deleteTGisXjqyByXJQYDM(String XJQYDM);
+    public int deleteTGisXjqyByFid(Long fid);
 }
diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/ITGisXjxzqService.java b/ruoyi-business/src/main/java/com/ruoyi/business/service/ITGisXjxzqService.java
index a7f609e..076eea3 100644
--- a/ruoyi-business/src/main/java/com/ruoyi/business/service/ITGisXjxzqService.java
+++ b/ruoyi-business/src/main/java/com/ruoyi/business/service/ITGisXjxzqService.java
@@ -7,17 +7,17 @@ import com.ruoyi.business.domain.TGisXjxzq;
  * 县级区域Service接口
  *
  * @author rongxin
- * @date 2025-09-04
+ * @date 2025-09-05
  */
 public interface ITGisXjxzqService
 {
     /**
      * 查询县级区域
      *
-     * @param XZQDM 县级区域主键
+     * @param fid 县级区域主键
      * @return 县级区域
      */
-    public TGisXjxzq selectTGisXjxzqByXZQDM(String XZQDM);
+    public TGisXjxzq selectTGisXjxzqByFid(Long fid);
 
     /**
      * 查询县级区域列表
@@ -72,16 +72,16 @@ public interface ITGisXjxzqService
     /**
      * 批量删除县级区域
      *
-     * @param XZQDMs 需要删除的县级区域主键集合
+     * @param fids 需要删除的县级区域主键集合
      * @return 结果
      */
-    public int deleteTGisXjxzqByXZQDMs(String[] XZQDMs);
+    public int deleteTGisXjxzqByFids(Long[] fids);
 
     /**
      * 删除县级区域信息
      *
-     * @param XZQDM 县级区域主键
+     * @param fid 县级区域主键
      * @return 结果
      */
-    public int deleteTGisXjxzqByXZQDM(String XZQDM);
+    public int deleteTGisXjxzqByFid(Long fid);
 }
diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TGisCjqyServiceImpl.java b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TGisCjqyServiceImpl.java
index 9f871bb..36f4acb 100644
--- a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TGisCjqyServiceImpl.java
+++ b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TGisCjqyServiceImpl.java
@@ -20,7 +20,7 @@ import java.util.stream.Collectors;
  * 村级区域Service业务层处理
  *
  * @author rongxin
- * @date 2025-09-04
+ * @date 2025-09-05
  */
 @Service
 public class TGisCjqyServiceImpl implements ITGisCjqyService
@@ -31,13 +31,13 @@ public class TGisCjqyServiceImpl implements ITGisCjqyService
     /**
      * 查询村级区域
      *
-     * @param CJQYDM 村级区域主键
+     * @param fid 村级区域主键
      * @return 村级区域
      */
     @Override
-    public TGisCjqy selectTGisCjqyByCJQYDM(String CJQYDM)
+    public TGisCjqy selectTGisCjqyByFid(Long fid)
     {
-        return tGisCjqyMapper.selectTGisCjqyByCJQYDM(CJQYDM);
+        return tGisCjqyMapper.selectTGisCjqyByFid(fid);
     }
 
     /**
@@ -93,7 +93,7 @@ public class TGisCjqyServiceImpl implements ITGisCjqyService
 
         for (TGisCjqy item : list) {
 
-            String  code = item.getImportCode();
+            String code = item.getImportCode();
             List<TGisCjqy> filters = tGisCjqyList.stream().filter(a -> a.getImportCode().equals(code)).collect(Collectors.toList());
             if (StringUtils.isEmpty(filters)) { //不存在时，直接插入
                 item.setCreateBy(operName);
@@ -185,24 +185,24 @@ public class TGisCjqyServiceImpl implements ITGisCjqyService
     /**
      * 批量删除村级区域
      *
-     * @param CJQYDMs 需要删除的村级区域主键
+     * @param fids 需要删除的村级区域主键
      * @return 结果
      */
     @Override
-    public int deleteTGisCjqyByCJQYDMs(String[] CJQYDMs)
+    public int deleteTGisCjqyByFids(Long[] fids)
     {
-        return tGisCjqyMapper.deleteTGisCjqyByCJQYDMs(CJQYDMs);
+        return tGisCjqyMapper.deleteTGisCjqyByFids(fids);
     }
 
     /**
      * 删除村级区域信息
      *
-     * @param CJQYDM 村级区域主键
+     * @param fid 村级区域主键
      * @return 结果
      */
     @Override
-    public int deleteTGisCjqyByCJQYDM(String CJQYDM)
+    public int deleteTGisCjqyByFid(Long fid)
     {
-        return tGisCjqyMapper.deleteTGisCjqyByCJQYDM(CJQYDM);
+        return tGisCjqyMapper.deleteTGisCjqyByFid(fid);
     }
 }
diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TGisXjqyServiceImpl.java b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TGisXjqyServiceImpl.java
index ee1da7c..16e3e9c 100644
--- a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TGisXjqyServiceImpl.java
+++ b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TGisXjqyServiceImpl.java
@@ -20,7 +20,7 @@ import java.util.stream.Collectors;
  * 乡级区域Service业务层处理
  *
  * @author rongxin
- * @date 2025-09-04
+ * @date 2025-09-05
  */
 @Service
 public class TGisXjqyServiceImpl implements ITGisXjqyService
@@ -31,13 +31,13 @@ public class TGisXjqyServiceImpl implements ITGisXjqyService
     /**
      * 查询乡级区域
      *
-     * @param XJQYDM 乡级区域主键
+     * @param fid 乡级区域主键
      * @return 乡级区域
      */
     @Override
-    public TGisXjqy selectTGisXjqyByXJQYDM(String XJQYDM)
+    public TGisXjqy selectTGisXjqyByFid(Long fid)
     {
-        return tGisXjqyMapper.selectTGisXjqyByXJQYDM(XJQYDM);
+        return tGisXjqyMapper.selectTGisXjqyByFid(fid);
     }
 
     /**
@@ -92,9 +92,7 @@ public class TGisXjqyServiceImpl implements ITGisXjqyService
         List<TGisXjqy> tGisXjqyList = tGisXjqyMapper.selectTGisXjqyList(tGisXjqy);
 
         for (TGisXjqy item : list) {
-
-            // 验证是否存在这个乡级区域信息
-            String  code = item.getImportCode();
+            String code = item.getImportCode();
             List<TGisXjqy> filters = tGisXjqyList.stream().filter(a -> a.getImportCode().equals(code)).collect(Collectors.toList());
             if (StringUtils.isEmpty(filters)) { //不存在时，直接插入
                 item.setCreateBy(operName);
@@ -186,24 +184,24 @@ public class TGisXjqyServiceImpl implements ITGisXjqyService
     /**
      * 批量删除乡级区域
      *
-     * @param XJQYDMs 需要删除的乡级区域主键
+     * @param fids 需要删除的乡级区域主键
      * @return 结果
      */
     @Override
-    public int deleteTGisXjqyByXJQYDMs(String[] XJQYDMs)
+    public int deleteTGisXjqyByFids(Long[] fids)
     {
-        return tGisXjqyMapper.deleteTGisXjqyByXJQYDMs(XJQYDMs);
+        return tGisXjqyMapper.deleteTGisXjqyByFids(fids);
     }
 
     /**
      * 删除乡级区域信息
      *
-     * @param XJQYDM 乡级区域主键
+     * @param fid 乡级区域主键
      * @return 结果
      */
     @Override
-    public int deleteTGisXjqyByXJQYDM(String XJQYDM)
+    public int deleteTGisXjqyByFid(Long fid)
     {
-        return tGisXjqyMapper.deleteTGisXjqyByXJQYDM(XJQYDM);
+        return tGisXjqyMapper.deleteTGisXjqyByFid(fid);
     }
 }
diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TGisXjxzqServiceImpl.java b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TGisXjxzqServiceImpl.java
index 266e79b..ebb11ac 100644
--- a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TGisXjxzqServiceImpl.java
+++ b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TGisXjxzqServiceImpl.java
@@ -20,7 +20,7 @@ import java.util.stream.Collectors;
  * 县级区域Service业务层处理
  *
  * @author rongxin
- * @date 2025-09-04
+ * @date 2025-09-05
  */
 @Service
 public class TGisXjxzqServiceImpl implements ITGisXjxzqService
@@ -31,13 +31,13 @@ public class TGisXjxzqServiceImpl implements ITGisXjxzqService
     /**
      * 查询县级区域
      *
-     * @param XZQDM 县级区域主键
+     * @param fid 县级区域主键
      * @return 县级区域
      */
     @Override
-    public TGisXjxzq selectTGisXjxzqByXZQDM(String XZQDM)
+    public TGisXjxzq selectTGisXjxzqByFid(Long fid)
     {
-        return tGisXjxzqMapper.selectTGisXjxzqByXZQDM(XZQDM);
+        return tGisXjxzqMapper.selectTGisXjxzqByFid(fid);
     }
 
     /**
@@ -92,7 +92,7 @@ public class TGisXjxzqServiceImpl implements ITGisXjxzqService
         List<TGisXjxzq> tGisXjxzqList = tGisXjxzqMapper.selectTGisXjxzqList(tGisXjxzq);
 
         for (TGisXjxzq item : list) {
-            String  code = item.getImportCode();
+            String code = item.getImportCode();
             List<TGisXjxzq> filters = tGisXjxzqList.stream().filter(a -> a.getImportCode().equals(code)).collect(Collectors.toList());
             if (StringUtils.isEmpty(filters)) { //不存在时，直接插入
                 item.setCreateBy(operName);
@@ -184,24 +184,24 @@ public class TGisXjxzqServiceImpl implements ITGisXjxzqService
     /**
      * 批量删除县级区域
      *
-     * @param XZQDMs 需要删除的县级区域主键
+     * @param fids 需要删除的县级区域主键
      * @return 结果
      */
     @Override
-    public int deleteTGisXjxzqByXZQDMs(String[] XZQDMs)
+    public int deleteTGisXjxzqByFids(Long[] fids)
     {
-        return tGisXjxzqMapper.deleteTGisXjxzqByXZQDMs(XZQDMs);
+        return tGisXjxzqMapper.deleteTGisXjxzqByFids(fids);
     }
 
     /**
      * 删除县级区域信息
      *
-     * @param XZQDM 县级区域主键
+     * @param fid 县级区域主键
      * @return 结果
      */
     @Override
-    public int deleteTGisXjxzqByXZQDM(String XZQDM)
+    public int deleteTGisXjxzqByFid(Long fid)
     {
-        return tGisXjxzqMapper.deleteTGisXjxzqByXZQDM(XZQDM);
+        return tGisXjxzqMapper.deleteTGisXjxzqByFid(fid);
     }
 }
diff --git a/ruoyi-business/src/main/resources/mapper/business/TGisCjqyMapper.xml b/ruoyi-business/src/main/resources/mapper/business/TGisCjqyMapper.xml
index 6e41977..8923d01 100644
--- a/ruoyi-business/src/main/resources/mapper/business/TGisCjqyMapper.xml
+++ b/ruoyi-business/src/main/resources/mapper/business/TGisCjqyMapper.xml
@@ -5,77 +5,72 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.business.mapper.TGisCjqyMapper">
 
     <resultMap type="TGisCjqy" id="TGisCjqyResult">
-        <result property="CJQYDM"    column="CJQYDM"    />
-        <result property="CJQYMC"    column="CJQYMC"    />
-        <result property="BSM"    column="BSM"    />
-        <result property="YSDM"    column="YSDM"    />
+        <result property="cjqydm"    column="cjqydm"    />
+        <result property="cjqymc"    column="cjqymc"    />
+        <result property="bsm"    column="bsm"    />
+        <result property="ysdm"    column="ysdm"    />
         <result property="theGeom"    column="the_geom"    />
         <result property="importCode"    column="import_code"    />
         <result property="fid"    column="fid"    />
     </resultMap>
 
     <sql id="selectTGisCjqyVo">
-        select CJQYDM, CJQYMC, BSM, YSDM, the_geom, import_code, fid from t_gis_cjqy
+        select cjqydm, cjqymc, bsm, ysdm, the_geom, import_code, fid from t_gis_cjqy
     </sql>
 
     <select id="selectTGisCjqyList" parameterType="TGisCjqy" resultMap="TGisCjqyResult">
         <include refid="selectTGisCjqyVo"/>
         <where>
-            <if test="CJQYDM != null  and CJQYDM != ''"> and CJQYDM = #{CJQYDM}</if>
-            <if test="CJQYMC != null  and CJQYMC != ''"> and CJQYMC = #{CJQYMC}</if>
+            <if test="cjqydm != null  and cjqydm != ''"> and cjqydm = #{cjqydm}</if>
+            <if test="cjqymc != null  and cjqymc != ''"> and cjqymc = #{cjqymc}</if>
             <if test="importCode != null  and importCode != ''"> and import_code = #{importCode}</if>
-            <if test="fid != null "> and fid = #{fid}</if>
         </where>
     </select>
 
-    <select id="selectTGisCjqyByCJQYDM" parameterType="String" resultMap="TGisCjqyResult">
+    <select id="selectTGisCjqyByFid" parameterType="Long" resultMap="TGisCjqyResult">
         <include refid="selectTGisCjqyVo"/>
-        where CJQYDM = #{CJQYDM}
+        where fid = #{fid}
     </select>
 
-    <insert id="insertTGisCjqy" parameterType="TGisCjqy">
+    <insert id="insertTGisCjqy" parameterType="TGisCjqy" useGeneratedKeys="true" keyProperty="fid">
         insert into t_gis_cjqy
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="CJQYDM != null">CJQYDM,</if>
-            <if test="CJQYMC != null and CJQYMC != ''">CJQYMC,</if>
-            <if test="BSM != null">BSM,</if>
-            <if test="YSDM != null">YSDM,</if>
+            <if test="cjqydm != null and cjqydm != ''">cjqydm,</if>
+            <if test="cjqymc != null and cjqymc != ''">cjqymc,</if>
+            <if test="bsm != null">bsm,</if>
+            <if test="ysdm != null">ysdm,</if>
             <if test="theGeom != null">the_geom,</if>
             <if test="importCode != null and importCode != ''">import_code,</if>
-            <if test="fid != null">fid,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="CJQYDM != null">#{CJQYDM},</if>
-            <if test="CJQYMC != null and CJQYMC != ''">#{CJQYMC},</if>
-            <if test="BSM != null">#{BSM},</if>
-            <if test="YSDM != null">#{YSDM},</if>
+            <if test="cjqydm != null and cjqydm != ''">#{cjqydm},</if>
+            <if test="cjqymc != null and cjqymc != ''">#{cjqymc},</if>
+            <if test="bsm != null">#{bsm},</if>
+            <if test="ysdm != null">#{ysdm},</if>
             <if test="theGeom != null">#{theGeom},</if>
             <if test="importCode != null and importCode != ''">#{importCode},</if>
-            <if test="fid != null">#{fid},</if>
          </trim>
     </insert>
 
-    <insert id="insertTGisCjqyBatch" parameterType="list" >
+    <insert id="insertTGisCjqyBatch" parameterType="list"  useGeneratedKeys="true" keyProperty="fid">
         insert into t_gis_cjqy
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            CJQYDM,
-            CJQYMC,
-            BSM,
-            YSDM,
+            cjqydm,
+            cjqymc,
+            bsm,
+            ysdm,
             the_geom,
             import_code,
-            fid,
         </trim>
         values
         <foreach item="item" collection="list" separator="," >
             <trim prefix="(" suffix=")" suffixOverrides=",">
-                #{item.CJQYDM},
-                #{item.CJQYMC},
-                #{item.BSM},
-                #{item.YSDM},
+                #{item.cjqydm},
+                #{item.cjqymc},
+                #{item.bsm},
+                #{item.ysdm},
                 #{item.theGeom},
                 #{item.importCode},
-                #{item.fid},
             </trim>
         </foreach>
     </insert>
@@ -83,14 +78,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTGisCjqy" parameterType="TGisCjqy">
         update t_gis_cjqy
         <trim prefix="SET" suffixOverrides=",">
-            <if test="CJQYMC != null and CJQYMC != ''">CJQYMC = #{CJQYMC},</if>
-            <if test="BSM != null">BSM = #{BSM},</if>
-            <if test="YSDM != null">YSDM = #{YSDM},</if>
+            <if test="cjqydm != null and cjqydm != ''">cjqydm = #{cjqydm},</if>
+            <if test="cjqymc != null and cjqymc != ''">cjqymc = #{cjqymc},</if>
+            <if test="bsm != null">bsm = #{bsm},</if>
+            <if test="ysdm != null">ysdm = #{ysdm},</if>
             <if test="theGeom != null">the_geom = #{theGeom},</if>
             <if test="importCode != null and importCode != ''">import_code = #{importCode},</if>
-            <if test="fid != null">fid = #{fid},</if>
         </trim>
-        where CJQYDM = #{CJQYDM}
+        where fid = #{fid}
     </update>
 
     <!--批量更新-->
@@ -98,25 +93,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">
             update t_gis_cjqy
             <set>
-                <if test="item.CJQYMC != null and item.CJQYMC != ''">CJQYMC = #{item.CJQYMC},</if>
-                <if test="item.BSM != null">BSM = #{item.BSM},</if>
-                <if test="item.YSDM != null">YSDM = #{item.YSDM},</if>
+                <if test="item.cjqydm != null and item.cjqydm != ''">cjqydm = #{item.cjqydm},</if>
+                <if test="item.cjqymc != null and item.cjqymc != ''">cjqymc = #{item.cjqymc},</if>
+                <if test="item.bsm != null">bsm = #{item.bsm},</if>
+                <if test="item.ysdm != null">ysdm = #{item.ysdm},</if>
                 <if test="item.theGeom != null">the_geom = #{item.theGeom},</if>
                 <if test="item.importCode != null and item.importCode != ''">import_code = #{item.importCode},</if>
-                <if test="item.fid != null">fid = #{item.fid},</if>
             </set>
-            where CJQYDM = #{item.CJQYDM}
+            where fid = #{item.fid}
         </foreach>
     </update>
 
-    <delete id="deleteTGisCjqyByCJQYDM" parameterType="String">
-        delete from t_gis_cjqy where CJQYDM = #{CJQYDM}
+    <delete id="deleteTGisCjqyByFid" parameterType="Long">
+        delete from t_gis_cjqy where fid = #{fid}
     </delete>
 
-    <delete id="deleteTGisCjqyByCJQYDMs" parameterType="String">
-        delete from t_gis_cjqy where CJQYDM in
-        <foreach item="CJQYDM" collection="array" open="(" separator="," close=")">
-            #{CJQYDM}
+    <delete id="deleteTGisCjqyByFids" parameterType="String">
+        delete from t_gis_cjqy where fid in
+        <foreach item="fid" collection="array" open="(" separator="," close=")">
+            #{fid}
         </foreach>
     </delete>
 </mapper>
diff --git a/ruoyi-business/src/main/resources/mapper/business/TGisXjqyMapper.xml b/ruoyi-business/src/main/resources/mapper/business/TGisXjqyMapper.xml
index aae45e5..d4a09b5 100644
--- a/ruoyi-business/src/main/resources/mapper/business/TGisXjqyMapper.xml
+++ b/ruoyi-business/src/main/resources/mapper/business/TGisXjqyMapper.xml
@@ -5,77 +5,72 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.business.mapper.TGisXjqyMapper">
 
     <resultMap type="TGisXjqy" id="TGisXjqyResult">
-        <result property="XJQYDM"    column="XJQYDM"    />
-        <result property="XJQYMC"    column="XJQYMC"    />
-        <result property="BSM"    column="BSM"    />
-        <result property="YSDM"    column="YSDM"    />
+        <result property="xjqydm"    column="xjqydm"    />
+        <result property="xjqymc"    column="xjqymc"    />
+        <result property="bsm"    column="bsm"    />
+        <result property="ysdm"    column="ysdm"    />
         <result property="theGeom"    column="the_geom"    />
         <result property="importCode"    column="import_code"    />
         <result property="fid"    column="fid"    />
     </resultMap>
 
     <sql id="selectTGisXjqyVo">
-        select XJQYDM, XJQYMC, BSM, YSDM, the_geom, import_code, fid from t_gis_xjqy
+        select xjqydm, xjqymc, bsm, ysdm, the_geom, import_code, fid from t_gis_xjqy
     </sql>
 
     <select id="selectTGisXjqyList" parameterType="TGisXjqy" resultMap="TGisXjqyResult">
         <include refid="selectTGisXjqyVo"/>
         <where>
-            <if test="XJQYDM != null  and XJQYDM != ''"> and XJQYDM = #{XJQYDM}</if>
-            <if test="XJQYMC != null  and XJQYMC != ''"> and XJQYMC = #{XJQYMC}</if>
+            <if test="xjqydm != null  and xjqydm != ''"> and xjqydm = #{xjqydm}</if>
+            <if test="xjqymc != null  and xjqymc != ''"> and xjqymc = #{xjqymc}</if>
             <if test="importCode != null  and importCode != ''"> and import_code = #{importCode}</if>
-            <if test="fid != null "> and fid = #{fid}</if>
         </where>
     </select>
 
-    <select id="selectTGisXjqyByXJQYDM" parameterType="String" resultMap="TGisXjqyResult">
+    <select id="selectTGisXjqyByFid" parameterType="Long" resultMap="TGisXjqyResult">
         <include refid="selectTGisXjqyVo"/>
-        where XJQYDM = #{XJQYDM}
+        where fid = #{fid}
     </select>
 
-    <insert id="insertTGisXjqy" parameterType="TGisXjqy">
+    <insert id="insertTGisXjqy" parameterType="TGisXjqy" useGeneratedKeys="true" keyProperty="fid">
         insert into t_gis_xjqy
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="XJQYDM != null">XJQYDM,</if>
-            <if test="XJQYMC != null and XJQYMC != ''">XJQYMC,</if>
-            <if test="BSM != null">BSM,</if>
-            <if test="YSDM != null">YSDM,</if>
-            <if test="theGeom != null and theGeom != ''">the_geom,</if>
+            <if test="xjqydm != null and xjqydm != ''">xjqydm,</if>
+            <if test="xjqymc != null and xjqymc != ''">xjqymc,</if>
+            <if test="bsm != null">bsm,</if>
+            <if test="ysdm != null">ysdm,</if>
+            <if test="theGeom != null">the_geom,</if>
             <if test="importCode != null and importCode != ''">import_code,</if>
-            <if test="fid != null">fid,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="XJQYDM != null">#{XJQYDM},</if>
-            <if test="XJQYMC != null and XJQYMC != ''">#{XJQYMC},</if>
-            <if test="BSM != null">#{BSM},</if>
-            <if test="YSDM != null">#{YSDM},</if>
-            <if test="theGeom != null and theGeom != ''">#{theGeom},</if>
+            <if test="xjqydm != null and xjqydm != ''">#{xjqydm},</if>
+            <if test="xjqymc != null and xjqymc != ''">#{xjqymc},</if>
+            <if test="bsm != null">#{bsm},</if>
+            <if test="ysdm != null">#{ysdm},</if>
+            <if test="theGeom != null">#{theGeom},</if>
             <if test="importCode != null and importCode != ''">#{importCode},</if>
-            <if test="fid != null">#{fid},</if>
          </trim>
     </insert>
 
-    <insert id="insertTGisXjqyBatch" parameterType="list" >
+    <insert id="insertTGisXjqyBatch" parameterType="list"  useGeneratedKeys="true" keyProperty="fid">
         insert into t_gis_xjqy
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            XJQYDM,
-            XJQYMC,
-            BSM,
-            YSDM,
+            xjqydm,
+            xjqymc,
+            bsm,
+            ysdm,
             the_geom,
             import_code,
-            fid,
         </trim>
         values
         <foreach item="item" collection="list" separator="," >
             <trim prefix="(" suffix=")" suffixOverrides=",">
-                #{item.XJQYDM},
-                #{item.XJQYMC},
-                #{item.BSM},
-                #{item.YSDM},
+                #{item.xjqydm},
+                #{item.xjqymc},
+                #{item.bsm},
+                #{item.ysdm},
                 #{item.theGeom},
                 #{item.importCode},
-                #{item.fid},
             </trim>
         </foreach>
     </insert>
@@ -83,14 +78,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTGisXjqy" parameterType="TGisXjqy">
         update t_gis_xjqy
         <trim prefix="SET" suffixOverrides=",">
-            <if test="XJQYMC != null and XJQYMC != ''">XJQYMC = #{XJQYMC},</if>
-            <if test="BSM != null">BSM = #{BSM},</if>
-            <if test="YSDM != null">YSDM = #{YSDM},</if>
-            <if test="theGeom != null and theGeom != ''">the_geom = #{theGeom},</if>
+            <if test="xjqydm != null and xjqydm != ''">xjqydm = #{xjqydm},</if>
+            <if test="xjqymc != null and xjqymc != ''">xjqymc = #{xjqymc},</if>
+            <if test="bsm != null">bsm = #{bsm},</if>
+            <if test="ysdm != null">ysdm = #{ysdm},</if>
+            <if test="theGeom != null">the_geom = #{theGeom},</if>
             <if test="importCode != null and importCode != ''">import_code = #{importCode},</if>
-            <if test="fid != null">fid = #{fid},</if>
         </trim>
-        where XJQYDM = #{XJQYDM}
+        where fid = #{fid}
     </update>
 
     <!--批量更新-->
@@ -98,25 +93,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">
             update t_gis_xjqy
             <set>
-                <if test="item.XJQYMC != null and item.XJQYMC != ''">XJQYMC = #{item.XJQYMC},</if>
-                <if test="item.BSM != null">BSM = #{item.BSM},</if>
-                <if test="item.YSDM != null">YSDM = #{item.YSDM},</if>
-                <if test="item.theGeom != null and item.theGeom != ''">the_geom = #{item.theGeom},</if>
+                <if test="item.xjqydm != null and item.xjqydm != ''">xjqydm = #{item.xjqydm},</if>
+                <if test="item.xjqymc != null and item.xjqymc != ''">xjqymc = #{item.xjqymc},</if>
+                <if test="item.bsm != null">bsm = #{item.bsm},</if>
+                <if test="item.ysdm != null">ysdm = #{item.ysdm},</if>
+                <if test="item.theGeom != null">the_geom = #{item.theGeom},</if>
                 <if test="item.importCode != null and item.importCode != ''">import_code = #{item.importCode},</if>
-                <if test="item.fid != null">fid = #{item.fid},</if>
             </set>
-            where XJQYDM = #{item.XJQYDM}
+            where fid = #{item.fid}
         </foreach>
     </update>
 
-    <delete id="deleteTGisXjqyByXJQYDM" parameterType="String">
-        delete from t_gis_xjqy where XJQYDM = #{XJQYDM}
+    <delete id="deleteTGisXjqyByFid" parameterType="Long">
+        delete from t_gis_xjqy where fid = #{fid}
     </delete>
 
-    <delete id="deleteTGisXjqyByXJQYDMs" parameterType="String">
-        delete from t_gis_xjqy where XJQYDM in
-        <foreach item="XJQYDM" collection="array" open="(" separator="," close=")">
-            #{XJQYDM}
+    <delete id="deleteTGisXjqyByFids" parameterType="String">
+        delete from t_gis_xjqy where fid in
+        <foreach item="fid" collection="array" open="(" separator="," close=")">
+            #{fid}
         </foreach>
     </delete>
 </mapper>
diff --git a/ruoyi-business/src/main/resources/mapper/business/TGisXjxzqMapper.xml b/ruoyi-business/src/main/resources/mapper/business/TGisXjxzqMapper.xml
index 028a333..5ae3e5c 100644
--- a/ruoyi-business/src/main/resources/mapper/business/TGisXjxzqMapper.xml
+++ b/ruoyi-business/src/main/resources/mapper/business/TGisXjxzqMapper.xml
@@ -5,77 +5,72 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.business.mapper.TGisXjxzqMapper">
 
     <resultMap type="TGisXjxzq" id="TGisXjxzqResult">
-        <result property="XZQDM"    column="XZQDM"    />
-        <result property="XZQMC"    column="XZQMC"    />
-        <result property="BSM"    column="BSM"    />
-        <result property="YSDM"    column="YSDM"    />
+        <result property="xzqdm"    column="xzqdm"    />
+        <result property="xzqmc"    column="xzqmc"    />
+        <result property="bsm"    column="bsm"    />
+        <result property="ysdm"    column="ysdm"    />
         <result property="theGeom"    column="the_geom"    />
         <result property="importCode"    column="import_code"    />
         <result property="fid"    column="fid"    />
     </resultMap>
 
     <sql id="selectTGisXjxzqVo">
-        select XZQDM, XZQMC, BSM, YSDM, the_geom, import_code, fid from t_gis_xjxzq
+        select xzqdm, xzqmc, bsm, ysdm, the_geom, import_code, fid from t_gis_xjxzq
     </sql>
 
     <select id="selectTGisXjxzqList" parameterType="TGisXjxzq" resultMap="TGisXjxzqResult">
         <include refid="selectTGisXjxzqVo"/>
         <where>
-            <if test="XZQDM != null  and XZQDM != ''"> and XZQDM = #{XZQDM}</if>
-            <if test="XZQMC != null  and XZQMC != ''"> and XZQMC = #{XZQMC}</if>
+            <if test="xzqdm != null  and xzqdm != ''"> and xzqdm = #{xzqdm}</if>
+            <if test="xzqmc != null  and xzqmc != ''"> and xzqmc = #{xzqmc}</if>
             <if test="importCode != null  and importCode != ''"> and import_code = #{importCode}</if>
-            <if test="fid != null "> and fid = #{fid}</if>
         </where>
     </select>
 
-    <select id="selectTGisXjxzqByXZQDM" parameterType="String" resultMap="TGisXjxzqResult">
+    <select id="selectTGisXjxzqByFid" parameterType="Long" resultMap="TGisXjxzqResult">
         <include refid="selectTGisXjxzqVo"/>
-        where XZQDM = #{XZQDM}
+        where fid = #{fid}
     </select>
 
-    <insert id="insertTGisXjxzq" parameterType="TGisXjxzq">
+    <insert id="insertTGisXjxzq" parameterType="TGisXjxzq" useGeneratedKeys="true" keyProperty="fid">
         insert into t_gis_xjxzq
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="XZQDM != null">XZQDM,</if>
-            <if test="XZQMC != null and XZQMC != ''">XZQMC,</if>
-            <if test="BSM != null">BSM,</if>
-            <if test="YSDM != null">YSDM,</if>
-            <if test="theGeom != null and theGeom != ''">the_geom,</if>
+            <if test="xzqdm != null and xzqdm != ''">xzqdm,</if>
+            <if test="xzqmc != null and xzqmc != ''">xzqmc,</if>
+            <if test="bsm != null">bsm,</if>
+            <if test="ysdm != null">ysdm,</if>
+            <if test="theGeom != null">the_geom,</if>
             <if test="importCode != null and importCode != ''">import_code,</if>
-            <if test="fid != null">fid,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="XZQDM != null">#{XZQDM},</if>
-            <if test="XZQMC != null and XZQMC != ''">#{XZQMC},</if>
-            <if test="BSM != null">#{BSM},</if>
-            <if test="YSDM != null">#{YSDM},</if>
-            <if test="theGeom != null and theGeom != ''">#{theGeom},</if>
+            <if test="xzqdm != null and xzqdm != ''">#{xzqdm},</if>
+            <if test="xzqmc != null and xzqmc != ''">#{xzqmc},</if>
+            <if test="bsm != null">#{bsm},</if>
+            <if test="ysdm != null">#{ysdm},</if>
+            <if test="theGeom != null">#{theGeom},</if>
             <if test="importCode != null and importCode != ''">#{importCode},</if>
-            <if test="fid != null">#{fid},</if>
          </trim>
     </insert>
 
-    <insert id="insertTGisXjxzqBatch" parameterType="list" >
+    <insert id="insertTGisXjxzqBatch" parameterType="list"  useGeneratedKeys="true" keyProperty="fid">
         insert into t_gis_xjxzq
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            XZQDM,
-            XZQMC,
-            BSM,
-            YSDM,
+            xzqdm,
+            xzqmc,
+            bsm,
+            ysdm,
             the_geom,
             import_code,
-            fid,
         </trim>
         values
         <foreach item="item" collection="list" separator="," >
             <trim prefix="(" suffix=")" suffixOverrides=",">
-                #{item.XZQDM},
-                #{item.XZQMC},
-                #{item.BSM},
-                #{item.YSDM},
+                #{item.xzqdm},
+                #{item.xzqmc},
+                #{item.bsm},
+                #{item.ysdm},
                 #{item.theGeom},
                 #{item.importCode},
-                #{item.fid},
             </trim>
         </foreach>
     </insert>
@@ -83,14 +78,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTGisXjxzq" parameterType="TGisXjxzq">
         update t_gis_xjxzq
         <trim prefix="SET" suffixOverrides=",">
-            <if test="XZQMC != null and XZQMC != ''">XZQMC = #{XZQMC},</if>
-            <if test="BSM != null">BSM = #{BSM},</if>
-            <if test="YSDM != null">YSDM = #{YSDM},</if>
-            <if test="theGeom != null and theGeom != ''">the_geom = #{theGeom},</if>
+            <if test="xzqdm != null and xzqdm != ''">xzqdm = #{xzqdm},</if>
+            <if test="xzqmc != null and xzqmc != ''">xzqmc = #{xzqmc},</if>
+            <if test="bsm != null">bsm = #{bsm},</if>
+            <if test="ysdm != null">ysdm = #{ysdm},</if>
+            <if test="theGeom != null">the_geom = #{theGeom},</if>
             <if test="importCode != null and importCode != ''">import_code = #{importCode},</if>
-            <if test="fid != null">fid = #{fid},</if>
         </trim>
-        where XZQDM = #{XZQDM}
+        where fid = #{fid}
     </update>
 
     <!--批量更新-->
@@ -98,25 +93,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">
             update t_gis_xjxzq
             <set>
-                <if test="item.XZQMC != null and item.XZQMC != ''">XZQMC = #{item.XZQMC},</if>
-                <if test="item.BSM != null">BSM = #{item.BSM},</if>
-                <if test="item.YSDM != null">YSDM = #{item.YSDM},</if>
-                <if test="item.theGeom != null and item.theGeom != ''">the_geom = #{item.theGeom},</if>
+                <if test="item.xzqdm != null and item.xzqdm != ''">xzqdm = #{item.xzqdm},</if>
+                <if test="item.xzqmc != null and item.xzqmc != ''">xzqmc = #{item.xzqmc},</if>
+                <if test="item.bsm != null">bsm = #{item.bsm},</if>
+                <if test="item.ysdm != null">ysdm = #{item.ysdm},</if>
+                <if test="item.theGeom != null">the_geom = #{item.theGeom},</if>
                 <if test="item.importCode != null and item.importCode != ''">import_code = #{item.importCode},</if>
-                <if test="item.fid != null">fid = #{item.fid},</if>
             </set>
-            where XZQDM = #{item.XZQDM}
+            where fid = #{item.fid}
         </foreach>
     </update>
 
-    <delete id="deleteTGisXjxzqByXZQDM" parameterType="String">
-        delete from t_gis_xjxzq where XZQDM = #{XZQDM}
+    <delete id="deleteTGisXjxzqByFid" parameterType="Long">
+        delete from t_gis_xjxzq where fid = #{fid}
     </delete>
 
-    <delete id="deleteTGisXjxzqByXZQDMs" parameterType="String">
-        delete from t_gis_xjxzq where XZQDM in
-        <foreach item="XZQDM" collection="array" open="(" separator="," close=")">
-            #{XZQDM}
+    <delete id="deleteTGisXjxzqByFids" parameterType="String">
+        delete from t_gis_xjxzq where fid in
+        <foreach item="fid" collection="array" open="(" separator="," close=")">
+            #{fid}
         </foreach>
     </delete>
 </mapper>