opt: 人大金仓st_astext改造

linwei

2026-04-07 4ac69d4737f355970db5eee503822af9e506a1f6

opt: 人大金仓st_astext改造

 drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/AttachMapper.xml

@@ -457,7 +457,7 @@
        '$.shootPosition.lat') ) AS latitude
        <if test="resultType!=null and resultType!='' and resultType==4">
            ,odm.orthoimage_api 'url',
            ST_AsText ( odm.geom ) "geom"
            public.st_astext ( odm.geom ) "geom"
        </if>
        from blade_attach attach
        left join manage_device device on attach.device_sn = device.device_sn::VARCHAR

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

@@ -63,8 +63,8 @@
        ad.area_size,
        case
            when ad.geom is null then null
            when ST_SRID(ad.geom) is null or ST_SRID(ad.geom) = 0 then ST_AsText(ad.geom)
            else concat(ST_AsText(ST_SwapXY(ad.geom)), ' | ', ST_SRID(ad.geom))
            when ST_SRID(ad.geom) is null or ST_SRID(ad.geom) = 0 then public.st_astext(ad.geom)
            else concat(public.st_astext(ST_SwapXY(ad.geom)), ' | ', ST_SRID(ad.geom))
        end as geom,
        ad.area_type,
        ad.trigger_condition,
@@ -110,8 +110,8 @@
        device_ids,
        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))
            when ST_SRID(geom) is null or ST_SRID(geom) = 0 then public.st_astext(geom)
            else concat(public.st_astext(ST_SwapXY(geom)), ' | ', ST_SRID(geom))
        end as geom,
        area_code,
        create_user,
@@ -187,8 +187,8 @@
        device_ids,
        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))
            when ST_SRID(geom) is null or ST_SRID(geom) = 0 then public.st_astext(geom)
            else concat(public.st_astext(ST_SwapXY(geom)), ' | ', ST_SRID(geom))
        end as geom,
        area_code,
        create_user,
@@ -212,7 +212,7 @@
        defense_scene_ids,
        area_divide_ids,
        device_ids,
        concat(ST_AsText(geom), ' | ', ST_SRID(geom)) as geom,
        concat(public.st_astext(geom), ' | ', ST_SRID(geom)) as geom,
        area_code,
        create_user,
        create_dept,

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml

@@ -37,7 +37,7 @@
               execute_start_time,
               execute_end_time,
               service_party,
               ST_AsText(geom) geom,
               public.st_astext(geom) geom,
               remark,
               reject_reason,
               area_code,
@@ -64,7 +64,7 @@
               execute_end_time,
               service_party,
               remark,
               ST_AsText(geom) geom,
               public.st_astext(geom) geom,
               reject_reason,
               area_code,
               create_user,
@@ -91,7 +91,7 @@
        wo.execute_start_time,
        wo.execute_end_time,
        wo.service_party,
        ST_AsText(wo.geom) geom,
        public.st_astext(wo.geom) geom,
        wo.remark,
        wo.area_code,
        wo.create_user,

 drone-task/drone-odm/src/main/java/org/sxkj/odm/mapper/OdmTaskInfoMapper.xml

@@ -124,7 +124,7 @@
        oti.vox_grid_tiles_path,
        oti.device_sn,
        wj.dkbh,
        COALESCE( ST_AsText ( oti.geom ), COALESCE( tli.sdfw, tli.dkfw )) AS geom
        COALESCE( public.st_astext ( oti.geom ), COALESCE( tli.sdfw, tli.dkfw )) AS geom
        FROM odm_task_info oti
        left join wayline_job wj on wj.job_id::VARCHAR = oti.wayline_job_id::VARCHAR
        left join tb_lot_info tli on tli.dkbh::VARCHAR = wj.dkbh::VARCHAR
@@ -174,7 +174,7 @@
        oti.vox_grid_tiles_path,
        oti.device_sn,
        tli.dkbh,
        COALESCE( ST_AsText ( oti.geom ), COALESCE( tli.sdfw, tli.dkfw )) AS geom
        COALESCE( public.st_astext ( oti.geom ), COALESCE( tli.sdfw, tli.dkfw )) AS geom
        FROM
        odm_task_info oti
        LEFT JOIN wayline_job wj ON wj.job_id = oti.wayline_job_id::VARCHAR AND wj.is_deleted = 0