From a029929bb402cf5af5c31caba40023010d232474 Mon Sep 17 00:00:00 2001
From: 王彪总 <thisjava@163.com>
Date: Fri, 29 May 2026 17:19:59 +0800
Subject: [PATCH] feat(garden): 添加GIS道路管理和坐标转换功能

---
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/problemtype/GardenProblemTypeMapper.java | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/problemtype/GardenProblemTypeMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/problemtype/GardenProblemTypeMapper.java
index 7b008cb..25e0940 100644
--- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/problemtype/GardenProblemTypeMapper.java
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/problemtype/GardenProblemTypeMapper.java
@@ -6,6 +6,8 @@ import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
 import com.zteits.urbanops.module.garden.controller.admin.problemtype.vo.ProblemTypePageReqVO;
 import com.zteits.urbanops.module.garden.dal.dataobject.problemtype.GardenProblemTypeDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -75,9 +77,15 @@ public interface GardenProblemTypeMapper extends BaseMapperX<GardenProblemTypeDO
     }
 
     /**
+     * 绕过逻辑删除，直接查 typeCode 是否物理存在（用于编码生成时避免唯一键冲突）
+     */
+    @Select("SELECT COUNT(1) FROM garden_problem_type WHERE type_code = #{code}")
+    int countByTypeCodeRaw(@Param("code") String code);
+
+    /**
      * 生成下一个编码：父级编码 + 5位递增序号
      * 如 parentCode=BIZ_GARDEN → BIZ_GARDEN00001, BIZ_GARDEN00002
-     * 注意：加 LENGTH 条件避免匹配到子级编码（如 yl0000100001 干扰 yl 下的二级编码）
+     * 注意：加 LENGTH 条件避免匹配到子级编码；绕过逻辑删除检查确保唯一键可用
      */
     default String generateNextCode(String parentCode) {
         int expectedLength = parentCode.length() + 5;
@@ -86,17 +94,26 @@ public interface GardenProblemTypeMapper extends BaseMapperX<GardenProblemTypeDO
                 .apply("LENGTH(type_code) = {0}", expectedLength)
                 .orderByDesc(GardenProblemTypeDO::getTypeCode)
                 .last("LIMIT 1"));
+        int seq;
         if (list == null || list.isEmpty()) {
-            return parentCode + "00001";
-        }
-        String maxCode = list.get(0).getTypeCode();
-        String seqStr = maxCode.substring(parentCode.length());
-        try {
-            int seq = Integer.parseInt(seqStr) + 1;
-            return parentCode + String.format("%05d", seq);
-        } catch (NumberFormatException e) {
-            return parentCode + "00001";
+            seq = 1;
+        } else {
+            String maxCode = list.get(0).getTypeCode();
+            String seqStr = maxCode.substring(parentCode.length());
+            try {
+                seq = Integer.parseInt(seqStr) + 1;
+            } catch (NumberFormatException e) {
+                seq = 1;
+            }
         }
+        // 跳过被逻辑删除记录占用的编码
+        int maxAttempts = 100;
+        String nextCode;
+        do {
+            nextCode = parentCode + String.format("%05d", seq);
+            seq++;
+        } while (countByTypeCodeRaw(nextCode) > 0 && --maxAttempts > 0);
+        return nextCode;
     }
 
 }
--
libgit2 0.21.4