From eeb3b5c9c794a35d7b7f3c8e56f9eef8eb8d3451 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 01 Apr 2026 17:20:19 +0800
Subject: [PATCH] opt:兼容人大金仓
---
drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/IFileMapper.xml | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/IFileMapper.xml b/drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/IFileMapper.xml
index 5cbe7f5..be133bc 100644
--- a/drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/IFileMapper.xml
+++ b/drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/IFileMapper.xml
@@ -39,12 +39,12 @@
COUNT( CASE WHEN m.file_name LIKE '%.jpeg' THEN 1 END ) AS picCount,
DATE_FORMAT(FROM_UNIXTIME(j.create_time/1000,'%Y-%m-%d'),'%Y-%m-%d') as create_time
FROM
- media_file m LEFT JOIN wayline_job j ON m.job_id = j.job_id
+ media_file m LEFT JOIN wayline_job j ON m.job_id = j.job_id::VARCHAR
-- LEFT JOIN (SELECT CONCAT("https://dev.jxpskj.com:8026/cloud-bucket",object_key) as url,job_id from media_file
- WHERE file_name LIKE '%.jpeg' GROUP BY job_id) t ON t.job_id = m.job_id
+ WHERE file_name LIKE '%.jpeg' GROUP BY job_id) t ON t.job_id = m.job_id::VARCHAR
LEFT JOIN (SELECT CONCAT(#{param.fileAddress},object_key) as url,job_id from media_file WHERE file_name LIKE
- '%.jpeg' GROUP BY job_id) t ON t.job_id = m.job_id
- LEFT JOIN wayline_file w ON w.wayline_id = j.file_id
+ '%.jpeg' GROUP BY job_id) t ON t.job_id = m.job_id::VARCHAR
+ LEFT JOIN wayline_file w ON w.wayline_id = j.file_id::VARCHAR
where 1=1
<if test="workspaceId != null and workspaceId != ''">
and j.workspace_id = #{workspaceId}
@@ -102,8 +102,8 @@
md.nickname as airportName
FROM
odm_task_info odm
- LEFT JOIN wayline_job wj ON wj.job_id = odm.wayline_job_id
- LEFT JOIN manage_device md on md.device_sn = wj.dock_sn
+ LEFT JOIN wayline_job wj ON wj.job_id = odm.wayline_job_id::VARCHAR
+ LEFT JOIN manage_device md on md.device_sn = wj.dock_sn::VARCHAR
<where>
AND wj.job_type = 4
AND wj.workspace_id = #{workspaceId}
@@ -116,7 +116,7 @@
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND date_format(FROM_UNIXTIME( wj.completed_time/1000),'%Y-%m-%d') between #{startTime} and #{endTime}
</if>
- AND odm.running_progress = 1.00
+ AND odm.running_progress = 1.00::VARCHAR
AND odm.orthoimage_path IS NOT NULL
ORDER BY
wj.end_time DESC
@@ -153,9 +153,9 @@
IFNULL( sum( CASE WHEN result_type = 5 THEN 1 ELSE 0 END ), 0 ) AS "fullNum"
FROM
blade_attach a
- LEFT JOIN wayline_job wj ON a.wayline_job_id = wj.job_id
- left JOIN wayline_job_info wji ON wji.id = wj.job_info_id AND wji.is_deleted = 0
- left join drone_job_event_rela rela on a.id = rela.attach_id
+ LEFT JOIN wayline_job wj ON a.wayline_job_id = wj.job_id::VARCHAR
+ left JOIN wayline_job_info wji ON wji.id = wj.job_info_id::VARCHAR AND wji.is_deleted = 0
+ left join drone_job_event_rela rela on a.id = rela.attach_id::VARCHAR
<where>
<if test="resultType != null">
AND a.result_type = #{resultType}
@@ -188,10 +188,10 @@
ROUND( sum( wj3d.area ) / 1000000, 2 ) AS gisNum
FROM
blade_attach a
- LEFT JOIN wayline_job wj ON a.wayline_job_id = wj.job_id
- left JOIN wayline_job_info wji ON wji.id = wj.job_info_id AND wji.is_deleted = 0
- left join drone_job_event_rela rela on a.id = rela.attach_id
- left join wayline_job_3d_record wj3d on wj3d.job_id = wj.job_id
+ LEFT JOIN wayline_job wj ON a.wayline_job_id = wj.job_id::VARCHAR
+ left JOIN wayline_job_info wji ON wji.id = wj.job_info_id::VARCHAR AND wji.is_deleted = 0
+ left join drone_job_event_rela rela on a.id = rela.attach_id::VARCHAR
+ left join wayline_job_3d_record wj3d on wj3d.job_id = wj.job_id::VARCHAR
<where>
<if test="resultType != null">
AND a.result_type = #{resultType}
@@ -224,7 +224,7 @@
IFNULL( sum( CASE WHEN result_type = 5 THEN 1 ELSE 0 END ), 0 ) AS "fullNum"
FROM
blade_attach a
- LEFT JOIN blade_dept b ON (a.create_dept = b.id)
+ LEFT JOIN blade_dept b ON (a.create_dept = b.id::VARCHAR)
<where>
-- 成果类型：0图片，1=视频，2=ai,3=三维，4=正射,5=全景, 6=图片压缩小，7=图片压缩中，8视频一帧图，9视频压缩，10ai压缩小，11ai压缩中',
AND a.result_type IN ( 3, 5 )
@@ -237,9 +237,9 @@
select count(*) "num", DATE_FORMAT(create_time,#{formatTime}) "time"
FROM
blade_attach a
- LEFT JOIN wayline_job wj ON a.wayline_job_id = wj.job_id
- left JOIN wayline_job_info wji ON wji.id = wj.job_info_id and wji.is_deleted = 0
- LEFT JOIN blade_dept b ON (a.create_dept = b.id)
+ LEFT JOIN wayline_job wj ON a.wayline_job_id = wj.job_id::VARCHAR
+ left JOIN wayline_job_info wji ON wji.id = wj.job_info_id::VARCHAR and wji.is_deleted = 0
+ LEFT JOIN blade_dept b ON (a.create_dept = b.id::VARCHAR)
<where>
<if test="startDate!=null">
and a.create_time >= #{startDate}
@@ -257,9 +257,9 @@
select count(*) "num"
FROM
blade_attach a
- LEFT JOIN wayline_job wj ON a.wayline_job_id = wj.job_id
- left JOIN wayline_job_info wji ON wji.id = wj.job_info_id and wji.is_deleted = 0
- LEFT JOIN blade_dept b ON (a.create_dept = b.id)
+ LEFT JOIN wayline_job wj ON a.wayline_job_id = wj.job_id::VARCHAR
+ left JOIN wayline_job_info wji ON wji.id = wj.job_info_id::VARCHAR and wji.is_deleted = 0
+ LEFT JOIN blade_dept b ON (a.create_dept = b.id::VARCHAR)
<where>
<if test="startDate!=null">
and a.create_time >= #{startDate}
--
Gitblit v1.9.3