区域划分调整

rain

2026-01-29 5b23a8cb9294506d88330f0750f39b9a2cbabbdc

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideExtMapper.xml

@@ -8,7 +8,7 @@
        <result column="area_divide_id" property="areaDivideId"/>
        <result column="area_type_key" property="areaTypeKey"/>
        <result column="area_type_value" property="areaTypeValue"/>
        <result column="geom" property="geom"/>
        <result column="geom_json" property="geomJson"/>
        <result column="area_code" property="areaCode"/>
    </resultMap>

@@ -18,12 +18,7 @@
            area_divide_id,
            area_type_key,
            area_type_value,
            case
                when geom is null then null
                when ST_SRID(geom) is null
                    or ST_SRID(geom) = 0 then ST_AsText(geom)
                else concat(ST_AsText(ST_SwapXY(geom)), ' | ', ST_SRID(geom))
                end as geom,
            geom_json,
            area_code,
            create_user,
            create_dept,
@@ -49,7 +44,7 @@
            area_divide_id,
            area_type_key,
            area_type_value,
            geom,
            geom_json,
            area_code,
            create_user,
            create_dept,
@@ -64,18 +59,7 @@
                #{item.areaDivideId},
                #{item.areaTypeKey},
                #{item.areaTypeValue},
                <choose>
                    <when test="item.geom != null and item.geom != ''">
                        case
                            when instr(#{item.geom}, '|') &gt; 0 then ST_SRID(
                                ST_GeomFromText(trim(substring_index(#{item.geom}, '|', 1))),
                                cast(trim(substring_index(#{item.geom}, '|', -1)) as unsigned)
                            )
                            else ST_GeomFromText(trim(#{item.geom}))
                        end
                    </when>
                    <otherwise>null</otherwise>
                </choose>,
                #{item.geomJson},
                #{item.areaCode},
                #{item.createUser},
                #{item.createDept},