From abe28fb2d90bedc4c06ffb389b9f73c2b1249848 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 09 Jun 2026 09:09:44 +0800
Subject: [PATCH] fix(odm): 修复任务信息中的结果类型设置问题

---
 drone-task/drone-odm/src/main/java/org/sxkj/odm/mapper/OdmTaskInfoMapper.xml |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drone-task/drone-odm/src/main/java/org/sxkj/odm/mapper/OdmTaskInfoMapper.xml b/drone-task/drone-odm/src/main/java/org/sxkj/odm/mapper/OdmTaskInfoMapper.xml
index 808e035..b38a033 100644
--- a/drone-task/drone-odm/src/main/java/org/sxkj/odm/mapper/OdmTaskInfoMapper.xml
+++ b/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
@@ -363,7 +363,7 @@
     <!--根据经纬度获取tif数据-->
     <select id="getTifDataByCoord" resultType="org.sxkj.odm.entity.OdmTaskInfo">
         SELECT * FROM odm_task_info
-        WHERE ST_Contains(geom, ST_GeometryFromText(concat('POINT(',#{longitude},' ',#{latitude}, ')'))) and is_deleted = 0
+        WHERE ST_Contains(geom, ST_GeomFromText(concat('POINT(',#{longitude},' ',#{latitude}, ')'))) and is_deleted = 0
         ORDER BY id desc
     </select>
 
@@ -376,7 +376,7 @@
           AND dem_tif_path IS NOT NULL
           AND ST_Distance_Sphere(
                   ST_Centroid(geom), -- geom中心点
-                  ST_GeometryFromText(concat('POINT(', #{longitude}, ' ', #{latitude}, ')'))) &lt;= 1000
+                  ST_GeomFromText(concat('POINT(', #{longitude}, ' ', #{latitude}, ')'))) &lt;= 1000
         ORDER BY id DESC
     </select>
 
@@ -426,7 +426,7 @@
             type = #{odmTaskInfo.type},
         </if>
         <if test="odmTaskInfo.geom !=null and odmTaskInfo.geom !=''">
-            geom = ST_GeometryFromText(${odmTaskInfo.geom})
+            geom = ST_GeomFromText(${odmTaskInfo.geom})
         </if>
         where id = #{odmTaskInfo.id}
     </update>

--
Gitblit v1.9.3