From b111f23684e8e85a36e670fcc1db19e8cb12ae9e Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 08 Apr 2026 13:46:52 +0800
Subject: [PATCH] opt: 人大金仓数据库改造
---
drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/AttachMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/AttachMapper.xml b/drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/AttachMapper.xml
index 2fb7415..fccd353 100644
--- a/drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/AttachMapper.xml
+++ b/drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/AttachMapper.xml
@@ -33,8 +33,8 @@
blade_dept bd on ba.create_dept::text = bd.id::text
where
ba.is_deleted = 0
- <if test="attach.originalName!=null and attach.originalName!=''">
- and ba.original_name like concat('%',#{attach.originalName},'%')
+ <if test="attach.nickName!=null and attach.nickName!=''">
+ and ba.nick_name like concat('%',#{attach.nickName},'%')
</if>
<if test="attach.resultType!=null">
/* 修改点2：如果 resultType 是字符串传入，也需加权转 */
@@ -273,7 +273,7 @@
and job.job_info_id is not null
<if test="attach.startTime!=null and attach.startTime!='' and attach.endTime!=null and attach.endTime!=''">
and (DATE_FORMAT(FROM_UNIXTIME(job.execute_time/1000,'%Y-%m-%d %H:%i:%s'),'%Y-%m-%d %H:%i:%s') between
- #{attach.startTime} and #{attach.endTime} or rela.create_time between #{attach.startTime} and #{attach.endTime} )
+ #{attach.startTime} and #{attach.endTime} or rela.create_time between #{attach.startTime}::timestamp and #{attach.endTime}::timestamp )
</if>
<if test="attach.name!=null and attach.name!=''">
and COALESCE(attach.nick_name, SUBSTRING_INDEX(SUBSTRING_INDEX(attach.NAME, '/', -1), '.', 1))
@@ -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
--
Gitblit v1.9.3