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-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml | 4
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml | 8
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml | 10
drone-ops/drone-flow/src/main/java/org/sxkj/flow/engine/mapper/FlowMapper.xml | 2
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml | 6
drone-service/drone-desk/src/main/java/org/sxkj/desk/mapper/NoticeMapper.xml | 2
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml | 4
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml | 4
drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml | 24 +-
drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/OssMapper.xml | 2
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml | 2
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml | 4
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml | 8
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml | 2
drone-task/drone-odm/src/main/java/org/sxkj/odm/mapper/OdmTaskInfoMapper.xml | 66 ++++----
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml | 36 ++--
drone-service/drone-system/src/main/java/org/sxkj/system/mapper/MenuMapper.xml | 4
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml | 6
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml | 6
drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/IFileMapper.xml | 42 +++---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 36 ++--
drone-service/drone-system/src/main/java/org/sxkj/system/mapper/RoleMapper.xml | 2
drone-service/drone-system/src/main/java/org/sxkj/system/mapper/SysConfigMapper.xml | 8
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditMapper.xml | 2
drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/AttachMapper.xml | 94 ++++++------
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditAttachmentMapper.xml | 2
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml | 16 +-
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml | 12
28 files changed, 207 insertions(+), 207 deletions(-)
diff --git a/drone-ops/drone-flow/src/main/java/org/sxkj/flow/engine/mapper/FlowMapper.xml b/drone-ops/drone-flow/src/main/java/org/sxkj/flow/engine/mapper/FlowMapper.xml
index 1ff1a5f..7460936 100644
--- a/drone-ops/drone-flow/src/main/java/org/sxkj/flow/engine/mapper/FlowMapper.xml
+++ b/drone-ops/drone-flow/src/main/java/org/sxkj/flow/engine/mapper/FlowMapper.xml
@@ -46,7 +46,7 @@
<select id="findByParentModelId" parameterType="string" resultMap="flowModelResultMap">
select model.* from ACT_DE_MODEL_RELATION modelrelation
- inner join ACT_DE_MODEL model on modelrelation.model_id = model.id
+ inner join ACT_DE_MODEL model on modelrelation.model_id = model.id::VARCHAR
where modelrelation.parent_model_id = #{_parameter}
</select>
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 26fc830..6d56f41 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
@@ -29,7 +29,7 @@
from
blade_attach ba
left join
- blade_dept bd on ba.create_dept = bd.id
+ blade_dept bd on ba.create_dept = bd.id::VARCHAR
where
ba.is_deleted = 0
<if test="attach.originalName!=null and attach.originalName!=''">
@@ -69,9 +69,9 @@
wj.name AS job_name,
rela.status
from blade_attach attach
- left join drone_job_event_rela rela on attach.id = rela.attach_id
- left join wayline_job wj ON attach.wayline_job_id = wj.job_id
- left join wayline_job_info info on wj.job_info_id = info.id
+ left join drone_job_event_rela rela on attach.id = rela.attach_id::VARCHAR
+ left join wayline_job wj ON attach.wayline_job_id = wj.job_id::VARCHAR
+ left join wayline_job_info info on wj.job_info_id = info.id::VARCHAR
where attach.is_deleted = 0
and info.is_deleted = 0
and attach.is_thumbnail = 0
@@ -150,7 +150,7 @@
<select id="findAllMd5ByAi" resultType="org.sxkj.resource.vo.EventImgMd5VO">
select md5,original_md5
from drone_job_event_rela rela
- left join ai_event_record record on rela.ai_event_record_uuid=record.uuid
+ left join ai_event_record record on rela.ai_event_record_uuid = record.uuid::VARCHAR
<where>
and record.id in
<foreach collection="aiRecordIds" item="eventRecordId" separator="," open="(" close=")">
@@ -183,7 +183,7 @@
attach.create_time,
rela.status
from blade_attach attach
- right join drone_job_event_rela rela on attach.id = rela.attach_id
+ right join drone_job_event_rela rela on attach.id = rela.attach_id::VARCHAR
where attach.is_deleted = 0 and attach.is_thumbnail = 0
<if test="attach.nickName != null and attach.nickName != ''">
AND (nick_name LIKE CONCAT('%', #{attach.nickName}, '%') OR name LIKE CONCAT('%', #{attach.nickName}, '%'))
@@ -256,12 +256,12 @@
</if>
device.nickName nestName
from blade_attach attach
- left join wayline_job job on attach.wayline_job_id = job.job_id
- left join wayline_job_info wji on wji.id = job.job_info_id
- left join manage_device device on job.dock_sn = device.device_sn
- left join manage_device_expansion mde on job.dock_sn = mde.device_sn
- left join blade_region region on device.area_code = region.code
- left join drone_job_event_rela rela on attach.id = rela.attach_id
+ left join wayline_job job on attach.wayline_job_id = job.job_id::VARCHAR
+ left join wayline_job_info wji on wji.id = job.job_info_id::VARCHAR
+ left join manage_device device on job.dock_sn = device.device_sn::VARCHAR
+ left join manage_device_expansion mde on job.dock_sn = mde.device_sn::VARCHAR
+ left join blade_region region on device.area_code = region.code::VARCHAR
+ left join drone_job_event_rela rela on attach.id = rela.attach_id::VARCHAR
where
attach.is_deleted = 0
and wji.is_deleted = 0
@@ -358,7 +358,7 @@
and create_time > #{startTime}
and create_time < #{endTime}
GROUP BY create_dept) b
- on (a.id = b.create_dept)
+ on (a.id = b.create_dept::VARCHAR)
</select>
<!--判断附件是否已存在-->
@@ -390,9 +390,9 @@
device.area_code "dictKey",
count(*)"num"
from blade_attach attach
- left join manage_device device on attach.device_sn=device.device_sn
- left join wayline_job job on attach.wayline_job_id = job.job_id
- left join wayline_job_info wji on wji.id = job.job_info_id
+ left join manage_device device on attach.device_sn = device.device_sn::VARCHAR
+ left join wayline_job job on attach.wayline_job_id = job.job_id::VARCHAR
+ left join wayline_job_info wji on wji.id = job.job_info_id::VARCHAR
<where>
and attach.is_deleted = 0
and wji.is_deleted = 0
@@ -424,12 +424,12 @@
device.area_code "dictKey"
FROM
odm_task_info oti
- LEFT JOIN wayline_job wj ON wj.job_id = oti.wayline_job_id
- LEFT JOIN manage_device device ON wj.dock_sn = device.device_sn
- LEFT JOIN tb_lot_info tli ON tli.dkbh = wj.dkbh
+ LEFT JOIN wayline_job wj ON wj.job_id = oti.wayline_job_id::VARCHAR
+ LEFT JOIN manage_device device ON wj.dock_sn = device.device_sn::VARCHAR
+ LEFT JOIN tb_lot_info tli ON tli.dkbh = wj.dkbh::VARCHAR
WHERE
( wj.job_type = 4 OR wj.job_type = 2 )
- AND oti.running_progress = 1.00
+ AND oti.running_progress = 1.00::VARCHAR
<if test="startDate!=null">
and oti.create_time >=#{startDate}
</if>
@@ -456,11 +456,11 @@
ST_AsText ( odm.geom ) "geom"
</if>
from blade_attach attach
- left join manage_device device on attach.device_sn=device.device_sn
- left join wayline_job job on attach.wayline_job_id = job.job_id
- left join wayline_job_info wji on wji.id = job.job_info_id
+ left join manage_device device on attach.device_sn = device.device_sn::VARCHAR
+ left join wayline_job job on attach.wayline_job_id = job.job_id::VARCHAR
+ left join wayline_job_info wji on wji.id = job.job_info_id::VARCHAR
<if test="resultType!=null and resultType!='' and resultType==4">
- left join odm_task_info odm on attach.wayline_job_id=odm.wayline_job_id
+ left join odm_task_info odm on attach.wayline_job_id = odm.wayline_job_id::VARCHAR
</if>
<where>
and attach.is_deleted = 0
@@ -517,7 +517,7 @@
rela.event_name,
ifnull(attach.result_type,2) "result_type"
FROM blade_attach attach
- LEFT JOIN drone_job_event_rela rela ON attach.id = rela.attach_id
+ LEFT JOIN drone_job_event_rela rela ON attach.id = rela.attach_id::VARCHAR
WHERE
attach.is_deleted = 0
AND attach.is_thumbnail = 0
@@ -569,9 +569,9 @@
device.nickname nestName,
CONCAT_WS(',', region.province_name, region.city_name, region.district_name) region_name
from blade_attach attach
- left join wayline_job job on attach.wayline_job_id = job.job_id
- left join manage_device device on attach.device_sn = device.device_sn
- left join blade_region region on device.area_code = region.code
+ left join wayline_job job on attach.wayline_job_id = job.job_id::VARCHAR
+ left join manage_device device on attach.device_sn = device.device_sn::VARCHAR
+ left join blade_region region on device.area_code = region.code::VARCHAR
where attach.id = #{id}
</select>
@@ -592,10 +592,10 @@
device.nickname,
CONCAT_WS(',', region.province_name, region.city_name, region.district_name) region_name
from wayline_job job
- left join blade_attach attach on attach.wayline_job_id = job.job_id
- left join manage_device device on attach.device_sn = device.device_sn
- left join blade_region region on device.area_code = region.code
- left join drone_job_event_rela rela on attach.id = rela.attach_id
+ left join blade_attach attach on attach.wayline_job_id = job.job_id::VARCHAR
+ left join manage_device device on attach.device_sn = device.device_sn::VARCHAR
+ left join blade_region region on device.area_code = region.code::VARCHAR
+ left join drone_job_event_rela rela on attach.id = rela.attach_id::VARCHAR
where job.job_id = #{jobId}
and attach.result_type in (0, 2, 5)
</select>
@@ -605,9 +605,9 @@
attach.result_type type,
count(attach.id) count
FROM blade_attach attach
- LEFT JOIN wayline_job wj ON attach.wayline_job_id = wj.job_id
- LEFT JOIN wayline_job_info wji on wji.id = wj.job_info_id
- LEFT JOIN drone_job_event_rela rela on attach.id = rela.attach_id
+ LEFT JOIN wayline_job wj ON attach.wayline_job_id = wj.job_id::VARCHAR
+ LEFT JOIN wayline_job_info wji on wji.id = wj.job_info_id::VARCHAR
+ LEFT JOIN drone_job_event_rela rela on attach.id = rela.attach_id::VARCHAR
<where>
<if test="param.deviceSn!=null and param.deviceSn!=''">
and attach.device_sn = #{param.deviceSn}
@@ -642,9 +642,9 @@
ROUND( sum( wj3d.area ) / 1000000, 2 ) AS area
FROM
blade_attach attach
- LEFT JOIN wayline_job wj ON attach.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 wayline_job_3d_record wj3d on wj3d.job_id = wj.job_id
+ LEFT JOIN wayline_job wj ON attach.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 wayline_job_3d_record wj3d on wj3d.job_id = wj.job_id::VARCHAR
<where>
<if test="param.deviceSn!=null and param.deviceSn!=''">
AND attach.device_sn = #{param.deviceSn}
@@ -691,9 +691,9 @@
wj3d.area_code
FROM
blade_attach attach
- LEFT JOIN wayline_job wj ON attach.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 wayline_job_3d_record wj3d on wj3d.job_id = wj.job_id
+ LEFT JOIN wayline_job wj ON attach.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 wayline_job_3d_record wj3d on wj3d.job_id = wj.job_id::VARCHAR
<where>
<if test="param.deviceSn!=null and param.deviceSn!=''">
AND attach.device_sn = #{param.deviceSn}
@@ -742,8 +742,8 @@
count(attach.id) count,
DATE_FORMAT(attach.create_time, #{param1.formatTime}) timeStr
from blade_attach attach
- LEFT JOIN wayline_job wj ON attach.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 wayline_job wj ON attach.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
<where>
<if test="param1.deviceSn!=null and param1.deviceSn!=''">
and attach.device_sn = #{param1.deviceSn}
@@ -782,9 +782,9 @@
<delete id="deleteAttach">
UPDATE blade_attach ba
- INNER JOIN wayline_job wj ON ba.wayline_job_id = wj.job_id
- INNER JOIN wayline_job_info wji ON wj.job_info_id = wji.id
- INNER JOIN wayline_job_record wjr ON wji.id = wjr.job_info_id
+ INNER JOIN wayline_job wj ON ba.wayline_job_id = wj.job_id::VARCHAR
+ INNER JOIN wayline_job_info wji ON wj.job_info_id = wji.id::VARCHAR
+ INNER JOIN wayline_job_record wjr ON wji.id = wjr.job_info_id::VARCHAR
SET ba.is_deleted = 1,
ba.update_user = #{operator}
WHERE ba.workspace_id = #{workspaceId}
@@ -826,7 +826,7 @@
FROM
blade_attach a
INNER JOIN
- wayline_job j ON a.wayline_job_id = j.job_id
+ wayline_job j ON a.wayline_job_id = j.job_id::VARCHAR
WHERE
(
FIND_IN_SET(#{lotInfoId}, j.lot_info_id) > 0
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}
diff --git a/drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/OssMapper.xml b/drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/OssMapper.xml
index 287c8e5..e3bf207 100644
--- a/drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/OssMapper.xml
+++ b/drone-ops/drone-resource/src/main/java/org/sxkj/resource/mapper/OssMapper.xml
@@ -61,7 +61,7 @@
select
bo.*
from blade_oss bo
- left join sys_oss_bind sob on bo.id = sob.oss_id
+ left join sys_oss_bind sob on bo.id = sob.oss_id::VARCHAR
where bo.is_deleted = 0
and bo.status = 2
and sob.sn = #{sn}
diff --git a/drone-service/drone-desk/src/main/java/org/sxkj/desk/mapper/NoticeMapper.xml b/drone-service/drone-desk/src/main/java/org/sxkj/desk/mapper/NoticeMapper.xml
index ab4d5b3..0a41af0 100644
--- a/drone-service/drone-desk/src/main/java/org/sxkj/desk/mapper/NoticeMapper.xml
+++ b/drone-service/drone-desk/src/main/java/org/sxkj/desk/mapper/NoticeMapper.xml
@@ -40,7 +40,7 @@
d.dict_value AS categoryName
FROM
blade_notice n
- LEFT JOIN ( SELECT * FROM blade_dict WHERE CODE = 'notice' ) d ON n.category = d.dict_key
+ LEFT JOIN ( SELECT * FROM blade_dict WHERE CODE = 'notice' ) d ON n.category = d.dict_key::VARCHAR
WHERE
n.is_deleted = 0 and n.tenant_id = #{notice.tenantId}
<if test="notice.title!=null">
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
index 32e1e53..2fdfeb3 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
@@ -43,7 +43,7 @@
from
ja_fw_area_divide ad
left join
- ja_fw_police_station ps on ps.id = ad.police_station_id and ps.is_deleted = 0
+ ja_fw_police_station ps on ps.id = ad.police_station_id::VARCHAR and ps.is_deleted = 0
<where>
ad.is_deleted = 0
<if test="param2.id != null and param2.id != ''">
@@ -99,7 +99,7 @@
ps.contact_person as police_station_contact_person,
ps.contact_phone as police_station_contact_phone
from ja_fw_area_divide ad
- left join ja_fw_police_station ps on ps.id = ad.police_station_id and ps.is_deleted = 0
+ left join ja_fw_police_station ps on ps.id = ad.police_station_id::VARCHAR and ps.is_deleted = 0
<where>
ad.is_deleted = 0
<if test="deptList != null and deptList.size > 0">
@@ -112,7 +112,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
@@ -123,7 +123,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
@@ -234,7 +234,7 @@
ps.contact_person as police_station_contact_person,
ps.contact_phone as police_station_contact_phone
from ja_fw_area_divide ad
- left join ja_fw_police_station ps on ps.id = ad.police_station_id and ps.is_deleted = 0
+ left join ja_fw_police_station ps on ps.id = ad.police_station_id::VARCHAR and ps.is_deleted = 0
where ad.is_deleted = 0
and ad.id = #{id}
</select>
@@ -264,14 +264,14 @@
(
select group_concat(distinct ds.scene_name)
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and find_in_set(ad.id, ds.area_divide_ids)
) as scene_name,
(
select group_concat(distinct ds.scene_type)
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and find_in_set(ad.id, ds.area_divide_ids)
) as scene_type,
@@ -284,7 +284,7 @@
else (
select count(1)
from ja_fw_drone_alarm_record ar
- join ja_fw_device d on d.id = ar.device_id and d.is_deleted = 0
+ join ja_fw_device d on d.id = ar.device_id::VARCHAR and d.is_deleted = 0
where ar.is_deleted = 0
and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
)
@@ -294,7 +294,7 @@
else (
select count(1)
from ja_fw_effect_eval ee
- join ja_fw_device d on d.id = ee.device_id and d.is_deleted = 0
+ join ja_fw_device d on d.id = ee.device_id::VARCHAR and d.is_deleted = 0
where ee.is_deleted = 0
and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
)
@@ -304,7 +304,7 @@
else (
select count(1)
from ja_fw_effect_eval ee
- join ja_fw_device d on d.id = ee.device_id and d.is_deleted = 0
+ join ja_fw_device d on d.id = ee.device_id::VARCHAR and d.is_deleted = 0
where ee.is_deleted = 0
and ee.counter_effect = '1'
and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
@@ -316,7 +316,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and find_in_set(ad.id, ds.area_divide_ids)
)
@@ -398,7 +398,7 @@
else (
select count(1)
from ja_fw_drone_alarm_record ar
- join ja_fw_device d on d.id = ar.device_id and d.is_deleted = 0
+ join ja_fw_device d on d.id = ar.device_id::VARCHAR and d.is_deleted = 0
where ar.is_deleted = 0
and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
)
@@ -408,7 +408,7 @@
else (
select count(1)
from ja_fw_effect_eval ee
- join ja_fw_device d on d.id = ee.device_id and d.is_deleted = 0
+ join ja_fw_device d on d.id = ee.device_id::VARCHAR and d.is_deleted = 0
where ee.is_deleted = 0
and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
)
@@ -418,7 +418,7 @@
else (
select count(1)
from ja_fw_effect_eval ee
- join ja_fw_device d on d.id = ee.device_id and d.is_deleted = 0
+ join ja_fw_device d on d.id = ee.device_id::VARCHAR and d.is_deleted = 0
where ee.is_deleted = 0
and ee.counter_effect = 'success'
and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
@@ -467,7 +467,7 @@
ps.contact_person as police_station_contact_person,
ps.contact_phone as police_station_contact_phone
from ja_fw_area_divide ad
- left join ja_fw_police_station ps on ps.id = ad.police_station_id and ps.is_deleted = 0
+ left join ja_fw_police_station ps on ps.id = ad.police_station_id::VARCHAR and ps.is_deleted = 0
inner join (
SELECT
d.id
@@ -497,7 +497,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
@@ -508,7 +508,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
@@ -565,7 +565,7 @@
select
count(1)
from ja_fw_defense_scene_manage dsm
- left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id and ds.is_deleted = 0
+ left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0
where ds.is_deleted = 0
and find_in_set(#{areaId}, ds.area_divide_ids)
and dsm.is_deleted = 0
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml
index 05adbe6..752ffc8 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml
@@ -26,7 +26,7 @@
dsm.*,
ds.scene_name as defense_scene_name
from ja_fw_defense_scene_manage dsm
- left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id and ds.is_deleted = 0
+ left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0
<where>
dsm.is_deleted = 0
<if test="param2.name != null and param2.name != ''">
@@ -46,7 +46,7 @@
dsm.*,
ds.scene_name as defense_scene_name
from ja_fw_defense_scene_manage dsm
- left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id and ds.is_deleted = 0
+ left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0
where dsm.is_deleted = 0
and dsm.id = #{id}
</select>
@@ -72,7 +72,7 @@
and find_in_set(ad.id, ds.area_divide_ids) > 0
) as device_count
from ja_fw_defense_scene_manage dsm
- left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id and ds.is_deleted = 0
+ left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0
<where>
dsm.is_deleted = 0
<if test="time != null">
@@ -102,7 +102,7 @@
SELECT
ad.device_ids
FROM ja_fw_defense_scene_manage dsm
- LEFT JOIN ja_fw_defense_scene ds ON ds.id = dsm.defense_scene_id AND ds.is_deleted = 0
+ LEFT JOIN ja_fw_defense_scene ds ON ds.id = dsm.defense_scene_id::VARCHAR AND ds.is_deleted = 0
LEFT JOIN ja_fw_area_divide ad ON FIND_IN_SET(ad.id, ds.area_divide_ids) > 0 AND ad.is_deleted = 0
WHERE dsm.id = #{id}
) ad ON CHAR_LENGTH(ad.device_ids) - CHAR_LENGTH(REPLACE(ad.device_ids, ',', '')) >= numbers.n - 1
@@ -114,7 +114,7 @@
dsm.*,
ds.scene_name as defense_scene_name
from ja_fw_defense_scene_manage dsm
- left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id and ds.is_deleted = 0
+ left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0
left join ja_fw_area_divide ad on FIND_IN_SET(ad.id, ds.area_divide_ids) > 0 and ad.is_deleted = 0
inner join (
SELECT
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml
index 6bcbf16..2ebb728 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml
@@ -68,7 +68,7 @@
select 1
from ja_fw_defense_scene_manage dsm
where dsm.is_deleted = 0
- and dsm.defense_scene_id = ds.id
+ and dsm.defense_scene_id = ds.id::VARCHAR
)
<if test="sceneManageId != null">
or exists (
@@ -76,7 +76,7 @@
from ja_fw_defense_scene_manage dsm
where dsm.is_deleted = 0
and dsm.id = #{sceneManageId}
- and dsm.defense_scene_id = ds.id
+ and dsm.defense_scene_id = ds.id::VARCHAR
)
</if>
)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml
index cabc485..d3a567b 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml
@@ -96,7 +96,7 @@
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
and find_in_set(ad.id, replace(ds.area_divide_ids, ' ', ''))
- left join ja_fw_police_station ps on ps.id = ad.police_station_id and ps.is_deleted = 0
+ left join ja_fw_police_station ps on ps.id = ad.police_station_id::VARCHAR and ps.is_deleted = 0
</select>
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
index 3fbdf15..17b7504 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
@@ -65,11 +65,11 @@
from
ja_fw_task_schedule ts
left join
- ja_fw_device d on d.id = ts.device_id
+ ja_fw_device d on d.id = ts.device_id::VARCHAR
left join
- ja_fw_area_divide ad on ad.id = ts.area_divide_id
+ ja_fw_area_divide ad on ad.id = ts.area_divide_id::VARCHAR
left join
- ja_fw_defense_scene_manage dsm on dsm.id = ts.defense_scene_id
+ ja_fw_defense_scene_manage dsm on dsm.id = ts.defense_scene_id::VARCHAR
left join
ja_fw_defense_zone dz on dz.is_deleted = 0
and dz.defense_scene_ids is not null
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml
index 1597bd0..a6b4cda 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml
@@ -42,7 +42,7 @@
<include refid="deviceFields"/>,a.*
from
ja_fw_device_maintain_plan a
- left join ja_fw_device b on (a.device_id = b.id)
+ left join ja_fw_device b on (a.device_id = b.id::VARCHAR)
<where>
a.is_deleted = 0
<if test="id != null and id != ''">
@@ -59,7 +59,7 @@
from
ja_fw_device_maintain_plan a
left join
- ja_fw_device b on (a.device_id = b.id)
+ ja_fw_device b on (a.device_id = b.id::VARCHAR)
<where>
a.is_deleted = 0
<if test="param2.deviceId != null and param2.deviceId != ''">
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
index 16dbc30..73a6a12 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
@@ -86,10 +86,10 @@
and status = #{param2.status}
</if>
<if test="param2.isTrack != null and param2.isTrack == 1">
- and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) > 0
+ and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id::VARCHAR) > 0
</if>
<if test="param2.isTrack != null and param2.isTrack == 2">
- and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) = 0
+ and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id::VARCHAR) = 0
</if>
<if test="param2.deptList != null and param2.deptList.size > 0">
and ( create_dept in
@@ -173,10 +173,10 @@
and status = #{status}
</if>
<if test="isTrack != null and isTrack == 1">
- and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) > 0
+ and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id::VARCHAR) > 0
</if>
<if test="isTrack != null and isTrack == 2">
- and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) = 0
+ and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id::VARCHAR) = 0
</if>
</where>
</select>
@@ -226,10 +226,10 @@
and status = #{query.status}
</if>
<if test="query.isTrack != null and query.isTrack == 1">
- and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) > 0
+ and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id::VARCHAR) > 0
</if>
<if test="query.isTrack != null and query.isTrack == 2">
- and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) = 0
+ and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id::VARCHAR) = 0
</if>
and longitude is not null
and longitude != ''
@@ -298,7 +298,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
@@ -345,7 +345,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
@@ -369,7 +369,7 @@
FROM
ja_fw_device a
LEFT JOIN
- blade_dict_biz b ON (a.device_type = b.dict_key AND b.code = 'deviceType' AND b.parent_id != 0)
+ blade_dict_biz b ON (a.device_type = b.dict_key::VARCHAR AND b.code = 'deviceType' AND b.parent_id != 0)
where a.is_deleted = 0
<if test="deptList != null and deptList.size > 0">
and ( a.create_dept in
@@ -477,7 +477,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
@@ -515,7 +515,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
@@ -552,7 +552,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
@@ -588,7 +588,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
@@ -624,7 +624,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
@@ -650,7 +650,7 @@
on find_in_set(ad.id, ds.area_divide_ids) > 0
and ds.is_deleted = 0
left join ja_fw_defense_scene_manage dsm
- on dsm.defense_scene_id = ds.id
+ on dsm.defense_scene_id = ds.id::VARCHAR
and dsm.is_deleted = 0
<where>
d.is_deleted = 0
@@ -659,7 +659,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
@@ -751,7 +751,7 @@
END AS isShared
FROM
ja_fw_device d
- LEFT JOIN ja_fw_device_per_share ps ON ps.device_id = d.id
+ LEFT JOIN ja_fw_device_per_share ps ON ps.device_id = d.id::VARCHAR
AND ps.loan_to_dept_id = #{currentDeptId}
AND ps.is_deleted = 0
WHERE
@@ -791,7 +791,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml
index d5be047..93dc678 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml
@@ -41,7 +41,7 @@
<include refid="deviceFields"/>,a.*
from
ja_fw_device_scrap a
- left join ja_fw_device b on (a.device_id = b.id)
+ left join ja_fw_device b on (a.device_id = b.id::VARCHAR)
<where>
a.is_deleted = 0
<if test="id != null and id != ''">
@@ -56,7 +56,7 @@
<include refid="deviceFields"/>,a.*
from
ja_fw_device_scrap a
- left join ja_fw_device b on (a.device_id = b.id)
+ left join ja_fw_device b on (a.device_id = b.id::VARCHAR)
<where>
a.is_deleted = 0
<if test="param2.deviceId != null and param2.deviceId != ''">
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
index 991da86..5fdfdc7 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
@@ -46,14 +46,14 @@
FROM
ja_fw_alarm_favorite f
WHERE
- f.alarm_record_id = dar.id
+ f.alarm_record_id = dar.id::VARCHAR
AND f.user_id = #{param2.currentUserId} -- MyBatis 参数
AND f.is_deleted = 0
) AS favorited
from
ja_fw_drone_alarm_record dar
left join
- ja_fw_device d on dar.device_id = d.id
+ ja_fw_device d on dar.device_id = d.id::VARCHAR
<where>
dar.is_deleted = 0
and d.is_enabled = 1
@@ -143,7 +143,7 @@
d.status deviceStatus
from
ja_fw_drone_alarm_record dar
- left join ja_fw_device d on dar.device_id = d.id
+ left join ja_fw_device d on dar.device_id = d.id::VARCHAR
<where>
dar.is_deleted = 0
<if test="ids != null and ids.size() > 0">
@@ -174,7 +174,7 @@
FROM
ja_fw_drone_alarm_record dar
left join
- ja_fw_device d on dar.device_id = d.id
+ ja_fw_device d on dar.device_id = d.id::VARCHAR
WHERE dar.is_deleted = 0
AND d.is_deleted = 0
and d.is_enabled = 1
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml
index 5c8a1ac..bb6fecd 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml
@@ -28,7 +28,7 @@
from
ja_fw_drone_flight_record dfr
left join
- ja_fw_device d on dfr.device_id = d.id
+ ja_fw_device d on dfr.device_id = d.id::VARCHAR
<where>
dfr.is_deleted = 0
and d.track_status = 1
@@ -94,9 +94,9 @@
FROM
ja_fw_drone_flight_record dfr
left join
- ja_fw_device d on dfr.device_id = d.id
+ ja_fw_device d on dfr.device_id = d.id::VARCHAR
left join
- ja_fw_drone_flight_record_detail dfrd on dfr.id = dfrd.flight_record_id
+ ja_fw_drone_flight_record_detail dfrd on dfr.id = dfrd.flight_record_id::VARCHAR
<where>
dfr.is_deleted = 0
<if test="ids != null and ids.size() > 0">
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml
index 83178d7..8a03f02 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdDataObjectionMapper.xml
@@ -37,9 +37,9 @@
ja_gd_data_objection do
left join
ja_gd_data_objection_attachment da
- on do.id = da.objection_id and da.is_deleted = 0
+ on do.id = da.objection_id::VARCHAR and da.is_deleted = 0
left join
- blade_dept bd on bd.id = do.create_dept
+ blade_dept bd on bd.id = do.create_dept::VARCHAR
<where>
do.is_deleted = 0
and da.is_deleted = 0
@@ -78,7 +78,7 @@
from
ja_gd_data_objection do
left join
- ja_gd_data_objection_attachment da on do.id = da.objection_id
+ ja_gd_data_objection_attachment da on do.id = da.objection_id::VARCHAR
<where>
and da.is_deleted = 0
<if test="id != null ">
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditAttachmentMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditAttachmentMapper.xml
index 6a64b6d..ff07bc3 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditAttachmentMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditAttachmentMapper.xml
@@ -54,7 +54,7 @@
round(attach.attach_size / 1024 / 1024, 2) as file_size,
attach.original_name as file_original_name
from ja_gd_supply_demand_audit_attachment audit_attachment
- left join blade_attach attach on attach.id = audit_attachment.attach_id and attach.is_deleted = 0
+ left join blade_attach attach on attach.id = audit_attachment.attach_id::VARCHAR and attach.is_deleted = 0
<where>
audit_attachment.is_deleted = 0
<if test="demandId != null">
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditMapper.xml
index f9c658f..f043a09 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/mapper/GdSupplyDemandAuditMapper.xml
@@ -48,7 +48,7 @@
<select id="selectSupplyDemandAuditList" resultMap="gdSupplyDemandAuditVOResultMap">
select a.*, u.name as user_name
from ja_gd_supply_demand_audit a
- left join blade_user u on a.create_user = u.id
+ left join blade_user u on a.create_user = u.id::VARCHAR
<where>
a.is_deleted = 0
<if test="demandId != null">
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
index ac5e1c0..2a6d831 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
@@ -89,8 +89,8 @@
ifnull(bu.real_name, bu.name) as dispose_user_name,
bd.dept_name as dispose_dept_name
from (select * from ja_gd_clue_event ${ew.customSqlSegment}) ce
- left join blade_user bu on bu.id = ce.dispose_user and bu.is_deleted = 0
- left join blade_dept bd on bd.id = ce.dispose_dept and bd.is_deleted = 0
+ left join blade_user bu on bu.id = ce.dispose_user::VARCHAR and bu.is_deleted = 0
+ left join blade_dept bd on bd.id = ce.dispose_dept::VARCHAR and bd.is_deleted = 0
</select>
<select id="selectGdClueEventSimpleList" resultMap="gdClueEventListVoResultMap">
@@ -98,7 +98,7 @@
tr.result_url as event_image_url,
ce.create_time as create_time
from ja_gd_clue_event ce
- left join ja_gd_task_result tr on tr.id = ce.result_id and tr.is_deleted = 0
+ left join ja_gd_task_result tr on tr.id = ce.result_id::VARCHAR and tr.is_deleted = 0
<include refid="gdClueEventDeptWhere"/>
and ce.event_status in (1, 3)
<if test="keyword != null and keyword != ''">
@@ -121,11 +121,11 @@
tr.shoot_time as shoot_time,
tr.result_url as event_image_url
from ja_gd_clue_event ce
- left join blade_user bu on bu.id = ce.dispose_user and bu.is_deleted = 0
- left join blade_dept bd on bd.id = ce.dispose_dept and bd.is_deleted = 0
- left join blade_user cu on cu.id = ce.create_user and cu.is_deleted = 0
- left join blade_dept cd on cd.id = ce.create_dept and cd.is_deleted = 0
- left join ja_gd_task_result tr on tr.id = ce.result_id and tr.is_deleted = 0
+ left join blade_user bu on bu.id = ce.dispose_user::VARCHAR and bu.is_deleted = 0
+ left join blade_dept bd on bd.id = ce.dispose_dept::VARCHAR and bd.is_deleted = 0
+ left join blade_user cu on cu.id = ce.create_user::VARCHAR and cu.is_deleted = 0
+ left join blade_dept cd on cd.id = ce.create_dept::VARCHAR and cd.is_deleted = 0
+ left join ja_gd_task_result tr on tr.id = ce.result_id::VARCHAR and tr.is_deleted = 0
<include refid="gdClueEventDeptWhere"/>
and ce.id = #{id}
</select>
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml
index 2c1f565..b32c485 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml
@@ -24,7 +24,7 @@
from
ja_gd_manage_device md
left join
- blade_dept bd on md.create_dept = bd.id
+ blade_dept bd on md.create_dept = bd.id::VARCHAR
<where>
and md.is_deleted = 0
<if test="param2.nickname != null and param2.nickname != ''">
@@ -67,7 +67,7 @@
d2.height as height
from
ja_gd_manage_device md
- left join ja_gd_manage_device d2 on md.device_sn = d2.device_sn and d2.device_type = '0'
+ left join ja_gd_manage_device d2 on md.device_sn = d2.device_sn::VARCHAR and d2.device_type = '0'
<where>
<if test="deviceIds != null and deviceIds.size() > 0">
and md.id in
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
index b0b6fd9..65c5416 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdPatrolTaskMapper.xml
@@ -39,9 +39,9 @@
from
ja_gd_patrol_task pt
left join
- ja_gd_work_order wo on pt.work_order_id = wo.id
+ ja_gd_work_order wo on pt.work_order_id = wo.id::VARCHAR
left join
- ja_gd_manage_device md on md.id = pt.device_id
+ ja_gd_manage_device md on md.id = pt.device_id::VARCHAR
left join
(
select patrol_task_id,
@@ -53,7 +53,7 @@
is_deleted = 0
group by
patrol_task_id
- ) tr on tr.patrol_task_id = pt.id
+ ) tr on tr.patrol_task_id = pt.id::VARCHAR
<where>
pt.is_deleted = 0
<if test="param2.workOrderId != null and param2.workOrderId != ''">
@@ -92,7 +92,7 @@
FROM
ja_gd_patrol_task pt
left join
- ja_gd_manage_device md on md.id = pt.device_id
+ ja_gd_manage_device md on md.id = pt.device_id::VARCHAR
WHERE pt.id = #{patrolTaskId}
</select>
@@ -109,9 +109,9 @@
FROM
ja_gd_patrol_task pt
left join
- ja_gd_work_order wo on pt.work_order_id = wo.id
+ ja_gd_work_order wo on pt.work_order_id = wo.id::VARCHAR
left join
- ja_gd_manage_device md on md.id = pt.device_id
+ ja_gd_manage_device md on md.id = pt.device_id::VARCHAR
WHERE pt.id = #{id}
</select>
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml
index 3145fb2..d1f03c0 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdTaskResultMapper.xml
@@ -53,10 +53,10 @@
WHERE ce1.is_deleted = 0
AND ce1.create_time = (SELECT MAX(create_time)
FROM ja_gd_clue_event ce2
- WHERE ce2.result_id = ce1.result_id
- AND ce2.is_deleted = 0)) ce ON ce.result_id = tr.id
- LEFT JOIN blade_user bu ON bu.id = ce.create_user AND bu.is_deleted = 0
- LEFT JOIN blade_dept bd ON bd.id = ce.create_dept AND bd.is_deleted = 0
+ WHERE ce2.result_id = ce1.result_id::VARCHAR
+ AND ce2.is_deleted = 0)) ce ON ce.result_id = tr.id::VARCHAR
+ LEFT JOIN blade_user bu ON bu.id = ce.create_user::VARCHAR AND bu.is_deleted = 0
+ LEFT JOIN blade_dept bd ON bd.id = ce.create_dept::VARCHAR AND bd.is_deleted = 0
WHERE tr.is_deleted = 0
AND tr.patrol_task_id = #{patrolTaskId}
</select>
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml
index 57f28f6..a7462c7 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdWorkOrderMapper.xml
@@ -103,7 +103,7 @@
wo.is_deleted,
bu.name create_user_name
from ja_gd_work_order wo
- left join blade_user bu on wo.create_user = bu.id
+ left join blade_user bu on wo.create_user = bu.id::VARCHAR
<where>
and wo.is_deleted = 0
<if test="param2.workOrderStatus != null and param2.workOrderStatus != ''">
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml
index 49c057e..4a0bbfd 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/DeptMapper.xml
@@ -153,7 +153,7 @@
<!--自定义详情查询-根据系统配置id-->
<select id="getDetailBySysConfigId" resultType="org.sxkj.system.vo.DeptVO">
select bd.* from blade_dept bd
- left join sys_config sc on sc.dept_id = bd.id and sc.is_deleted = 0
+ left join sys_config sc on sc.dept_id = bd.id::VARCHAR and sc.is_deleted = 0
where bd.is_deleted = 0
and sc.id = #{dept.sysConfigId}
</select>
@@ -163,7 +163,7 @@
select
bd.*,sc.id as sysConfigId,sc.name as sysName
from blade_dept bd
- left join sys_config sc on sc.dept_id = bd.id and sc.is_deleted = 0
+ left join sys_config sc on sc.dept_id = bd.id::VARCHAR and sc.is_deleted = 0
where bd.is_deleted = 0
and (
bd.id = #{deptId}
@@ -176,7 +176,7 @@
select
bd.*,sc.name as sysName
from blade_dept bd
- left join sys_config sc on sc.dept_id = bd.id and sc.is_deleted = 0
+ left join sys_config sc on sc.dept_id = bd.id::VARCHAR and sc.is_deleted = 0
where bd.is_deleted = 0
and (
bd.id = #{deptId}
@@ -195,7 +195,7 @@
bd.sort
FROM
blade_dept bd
- left join manage_device_per_share ddps on ddps.loan_to_dept_id = bd.id
+ left join manage_device_per_share ddps on ddps.loan_to_dept_id = bd.id::VARCHAR
where bd.is_deleted = 0
and bd.id != #{deptId}
and ifnull(device_sn,'') != #{deviceSn}
@@ -247,8 +247,8 @@
SELECT
CONCAT(p.name, ' ', c.name, ' ', r.name) AS full_region_name
FROM blade_region r
- LEFT JOIN blade_region c ON r.parent_code = c.code <!-- 市级 -->
- LEFT JOIN blade_region p ON c.parent_code = p.code <!-- 省级 -->
+ LEFT JOIN blade_region c ON r.parent_code = c.code::VARCHAR <!-- 市级 -->
+ LEFT JOIN blade_region p ON c.parent_code = p.code::VARCHAR <!-- 省级 -->
WHERE r.code = #{areaCode}
</select>
<select id="getSingleRegionName" resultType="string">
@@ -263,7 +263,7 @@
<!-- 市级：后 8 位为 0，且不是省级 -->
SELECT CONCAT(p.name, ' ', c.name) AS full_region_name
FROM blade_region c
- LEFT JOIN blade_region p ON c.parent_code = p.code
+ LEFT JOIN blade_region p ON c.parent_code = p.code::VARCHAR
WHERE SUBSTRING(#{areaCode}, 5, 8) = '00000000'
AND SUBSTRING(#{areaCode}, 3, 10) != '0000000000'
AND c.code = #{areaCode}
@@ -273,8 +273,8 @@
<!-- 县级：后 8 位不全为 0 -->
SELECT CONCAT(p.name, ' ', c.name, ' ', r.name) AS full_region_name
FROM blade_region r
- LEFT JOIN blade_region c ON r.parent_code = c.code
- LEFT JOIN blade_region p ON c.parent_code = p.code
+ LEFT JOIN blade_region c ON r.parent_code = c.code::VARCHAR
+ LEFT JOIN blade_region p ON c.parent_code = p.code::VARCHAR
WHERE SUBSTRING(#{areaCode}, 5, 8) != '00000000'
AND r.code = #{areaCode}
</select>
@@ -284,7 +284,7 @@
bd.*,
br.name AS area_name
FROM
- blade_dept bd LEFT JOIN blade_region br ON br.code = bd.area_code
+ blade_dept bd LEFT JOIN blade_region br ON br.code = bd.area_code::VARCHAR
WHERE
bd.is_deleted = 0
<if test="param2.deptName!=null and param2.deptName!=''">
@@ -306,7 +306,7 @@
FROM
blade_dept bd
LEFT JOIN
- blade_region br ON br.code = bd.area_code
+ blade_region br ON br.code = bd.area_code::VARCHAR
WHERE
bd.is_deleted = 0
<if test="deptName!=null and deptName!=''">
@@ -334,7 +334,7 @@
FROM
blade_dept bd
LEFT JOIN
- blade_region br ON br.code = bd.area_code
+ blade_region br ON br.code = bd.area_code::VARCHAR
WHERE
bd.is_deleted = 0
<if test="dept.id!=null">
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/MenuMapper.xml b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/MenuMapper.xml
index 1588c27..2fcd37a 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/MenuMapper.xml
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/MenuMapper.xml
@@ -571,8 +571,8 @@
m.path
FROM
blade_role_menu rm
- LEFT JOIN blade_menu m ON rm.menu_id = m.id
- LEFT JOIN blade_role r ON rm.role_id = r.id
+ LEFT JOIN blade_menu m ON rm.menu_id = m.id::VARCHAR
+ LEFT JOIN blade_role r ON rm.role_id = r.id::VARCHAR
WHERE
rm.role_id IN
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/RoleMapper.xml b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/RoleMapper.xml
index f355e3b..1c91d53 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/RoleMapper.xml
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/RoleMapper.xml
@@ -80,7 +80,7 @@
<if test="roleParam.roleAlias!=null and roleParam.roleAlias!=''">
and role_alias like concat('%',#{roleParam.roleAlias},'%')
</if>
- ) t4 on br.id = t4.id
+ ) t4 on br.id = t4.id::VARCHAR
<if test="roleParam.isNowLevel==0">
union all
(
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/SysConfigMapper.xml b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/SysConfigMapper.xml
index 76d547e..1b135ed 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/SysConfigMapper.xml
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/SysConfigMapper.xml
@@ -11,7 +11,7 @@
FROM
sys_config sc
LEFT JOIN
- blade_dept bd ON bd.id = sc.dept_id AND bd.is_deleted = 0
+ blade_dept bd ON bd.id = sc.dept_id::VARCHAR AND bd.is_deleted = 0
WHERE
sc.is_deleted = 0
<if test="sysConfig.name != null and sysConfig.name != ''">
@@ -33,9 +33,9 @@
FROM
manage_device_per_share mdps
LEFT JOIN
- sys_config sc ON sc.dept_id = mdps.dept_id AND sc.is_deleted = 0
+ sys_config sc ON sc.dept_id = mdps.dept_id::VARCHAR AND sc.is_deleted = 0
LEFT JOIN
- blade_dept bd ON bd.id = sc.dept_id AND bd.is_deleted = 0
+ blade_dept bd ON bd.id = sc.dept_id::VARCHAR AND bd.is_deleted = 0
WHERE
mdps.dept_id = #{deptId}
<if test="sysConfig.name != null and sysConfig.name != ''">
@@ -49,7 +49,7 @@
select
sc.*
from sys_config sc
- left join blade_dept bd on bd.id = sc.dept_id and bd.is_deleted = 0
+ left join blade_dept bd on bd.id = sc.dept_id::VARCHAR and bd.is_deleted = 0
where sc.is_deleted = 0
and sc.id = #{sysConfig.id}
</select>
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 6ec336d..3e3e978 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
@@ -12,10 +12,10 @@
wfe.gsd
FROM
odm_task_info oti
- left join wayline_job wj on wj.job_id = oti.wayline_job_id
- left join manage_device md on md.device_sn = wj.dock_sn
- left join blade_dept bd on bd.id = md.dept_id and bd.is_deleted = 0
- left join wayline_file_extension wfe on wj.file_id = wfe.wayline_id
+ left join wayline_job wj on wj.job_id = oti.wayline_job_id::VARCHAR
+ left join manage_device md on md.device_sn = wj.dock_sn::VARCHAR
+ left join blade_dept bd on bd.id = md.dept_id::VARCHAR and bd.is_deleted = 0
+ left join wayline_file_extension wfe on wj.file_id = wfe.wayline_id::VARCHAR
<where>
and oti.is_deleted = 0
<if test="odmTaskInfo.waylineJobId!=null and odmTaskInfo.waylineJobId!=''">
@@ -92,7 +92,7 @@
select oti.*,wj.job_type as waylineType,wj.dkbh,wj.workspace_id as workspaceId,wj.dock_sn as deviceSn,wj.name as waylineJobName,
date_format(FROM_UNIXTIME( wj.completed_time/ 1000),'%Y-%m-%d %H:%i:%s') as completedTime
from odm_task_info oti
- left join wayline_job wj on wj.job_id = oti.wayline_job_id and wj.is_deleted = 0
+ left join wayline_job wj on wj.job_id = oti.wayline_job_id::VARCHAR and wj.is_deleted = 0
where
oti.running_progress < 1.0 and oti.is_update = 0 and oti.is_deleted = 0
</select>
@@ -126,11 +126,11 @@
wj.dkbh,
IFNULL( ST_AsText ( oti.geom ), ifnull( tli.sdfw, tli.dkfw )) AS geom
FROM odm_task_info oti
- left join wayline_job wj on wj.job_id = oti.wayline_job_id
- left join tb_lot_info tli on tli.dkbh = wj.dkbh
+ left join wayline_job wj on wj.job_id = oti.wayline_job_id::VARCHAR
+ left join tb_lot_info tli on tli.dkbh = wj.dkbh::VARCHAR
where oti.is_deleted = 0
<if test="runningProgress!=null">
- and oti.running_progress = 1.00
+ and oti.running_progress = 1.00::VARCHAR
</if>
<if test="otrTaskTypes != null and otrTaskTypes.size()>0">
AND wj.job_type IN
@@ -177,12 +177,12 @@
IFNULL( ST_AsText ( oti.geom ), ifnull( tli.sdfw, tli.dkfw )) AS geom
FROM
odm_task_info oti
- LEFT JOIN wayline_job wj ON wj.job_id = oti.wayline_job_id AND wj.is_deleted = 0
- LEFT JOIN tb_lot_info tli ON tli.id = wj.lot_info_id AND tli.is_deleted = 0
+ LEFT JOIN wayline_job wj ON wj.job_id = oti.wayline_job_id::VARCHAR AND wj.is_deleted = 0
+ LEFT JOIN tb_lot_info tli ON tli.id = wj.lot_info_id::VARCHAR AND tli.is_deleted = 0
WHERE
oti.is_deleted = 0
<if test="runningProgress != null">
- AND oti.running_progress = 1.00
+ AND oti.running_progress = 1.00::VARCHAR
</if>
<if test="otrTaskTypes != null and otrTaskTypes.size()>0">
AND wj.job_type IN
@@ -205,8 +205,8 @@
<!--查询所有未在 webodm 创建任务的任务信息,一次暂时只处理1个-->
<select id="getNotByWebOdmCreateTaskList" resultType="org.sxkj.odm.vo.OdmTaskInfoVO">
SELECT oti.*,wfe.gsd FROM odm_task_info oti
- left join wayline_job wj on wj.job_id = oti.wayline_job_id
- left join wayline_file_extension wfe on wj.file_id = wfe.wayline_id
+ left join wayline_job wj on wj.job_id = oti.wayline_job_id::VARCHAR
+ left join wayline_file_extension wfe on wj.file_id = wfe.wayline_id::VARCHAR
where (oti.task_id is null or oti.task_id = '')
and oti.is_deleted = 0
order by oti.id desc
@@ -229,7 +229,7 @@
<!--查询没有生成的odm任务航线任务-->
<select id="getNoCreateTaskJob" resultType="java.lang.String">
SELECT wj.job_id FROM wayline_job wj
- LEFT JOIN odm_task_info oti ON wj.job_id = oti.wayline_job_id and oti.is_deleted = 0
+ LEFT JOIN odm_task_info oti ON wj.job_id = oti.wayline_job_id::VARCHAR and oti.is_deleted = 0
WHERE wj.STATUS = 3
AND wj.is_deleted = 0
AND wj.job_type IN
@@ -243,7 +243,7 @@
<!--根据航线任务id获取对应的机构id-->
<select id="getCreateDeptId" resultType="java.lang.Long">
select md.dept_id from wayline_job wj
- left join manage_device md on md.device_sn = wj.dock_sn
+ left join manage_device md on md.device_sn = wj.dock_sn::VARCHAR
where wj.job_id = #{jobId}
</select>
@@ -256,7 +256,7 @@
FROM
odm_task_info oti
LEFT JOIN blade_attach ba ON CONCAT( oti.base_path, oti.orthoimage_path )= ba.NAME and ba.is_deleted = 0
- left join wayline_job wj on wj.job_id = oti.wayline_job_id and wj.is_deleted = 0
+ left join wayline_job wj on wj.job_id = oti.wayline_job_id::VARCHAR and wj.is_deleted = 0
WHERE
ba.id IS NULL
AND oti.is_deleted = 0
@@ -278,9 +278,9 @@
count(*) AS c
FROM
odm_task_info oti
- LEFT JOIN wayline_job wj ON wj.job_id = oti.wayline_job_id
+ LEFT JOIN wayline_job wj ON wj.job_id = oti.wayline_job_id::VARCHAR
WHERE
- oti.running_progress = 1.00
+ oti.running_progress = 1.00::VARCHAR
AND oti.is_deleted = 0
AND wj.dkbh IS NOT NULL
GROUP BY
@@ -296,7 +296,7 @@
oti.*
FROM
odm_task_info oti
- left join wayline_job wj on wj.job_id = oti.wayline_job_id
+ left join wayline_job wj on wj.job_id = oti.wayline_job_id::VARCHAR
WHERE
wj.id IS NULL
AND oti.is_deleted = 0
@@ -314,12 +314,12 @@
date_format(FROM_UNIXTIME( wj.completed_time/ 1000),'%Y-%m-%d %H:%i:%s') as completedTime
FROM
odm_task_info oti
- left join wayline_job wj on wj.job_id = oti.wayline_job_id and wj.is_deleted = 0
+ left join wayline_job wj on wj.job_id = oti.wayline_job_id::VARCHAR and wj.is_deleted = 0
WHERE
oti.ort_tb_path IS NULL
and oti.is_deleted = 0
and oti.status = 40
- and oti.running_progress = 1.0
+ and oti.running_progress = 1.0::VARCHAR
and wj.dkbh is not null
<if test="otrTaskTypes != null and otrTaskTypes.size()>0">
AND wj.job_type IN
@@ -335,7 +335,7 @@
oti.*
FROM
odm_task_info oti
- left join wayline_job wj on wj.job_id = oti.wayline_job_id
+ left join wayline_job wj on wj.job_id = oti.wayline_job_id::VARCHAR
WHERE oti.file_del_flag = 0 and oti.is_deleted = 0
and wj.completed_time < UNIX_TIMESTAMP(NOW() - INTERVAL {day} DAY)*1000
</select>
@@ -344,10 +344,10 @@
<select id="getHistoryOdmTaskByTifComp" resultType="org.sxkj.odm.vo.OdmTaskInfoVO">
select oti.*,wj.job_type as waylineType,wj.dkbh,wj.workspace_id as workspaceId,wj.dock_sn as deviceSn
from odm_task_info oti
- left join wayline_job wj on wj.job_id = oti.wayline_job_id and wj.is_deleted = 0
- left join blade_attach ba on ba.wayline_job_id = oti.wayline_job_id and ba.is_deleted = 0 and ba.result_type = 4
+ left join wayline_job wj on wj.job_id = oti.wayline_job_id::VARCHAR and wj.is_deleted = 0
+ left join blade_attach ba on ba.wayline_job_id = oti.wayline_job_id::VARCHAR and ba.is_deleted = 0 and ba.result_type = 4
where
- oti.running_progress = 1.0
+ oti.running_progress = 1.0::VARCHAR
and oti.is_update = 1
and oti.file_del_flag = 0
and oti.status = 40
@@ -439,9 +439,9 @@
ROUND( sum( wj3d.area ) / 1000000, 2 ) AS area
FROM
blade_attach ba
- LEFT JOIN manage_device md ON ba.device_sn = md.device_sn
- left join wayline_job wj on ba.wayline_job_id = wj.job_id AND md.is_deleted = 0
- left join wayline_job_3d_record wj3d on wj3d.job_id = ba.wayline_job_id
+ LEFT JOIN manage_device md ON ba.device_sn = md.device_sn::VARCHAR
+ left join wayline_job wj on ba.wayline_job_id = wj.job_id::VARCHAR AND md.is_deleted = 0
+ left join wayline_job_3d_record wj3d on wj3d.job_id = ba.wayline_job_id::VARCHAR
<where>
AND ba.is_deleted = 0
AND wj.job_info_id is not null
@@ -477,8 +477,8 @@
select md.area_code,
ba.link as tilesPath
from blade_attach ba
- left join manage_device md on ba.device_sn = md.device_sn AND md.is_deleted = 0
- left join wayline_job wj on ba.wayline_job_id = wj.job_id
+ left join manage_device md on ba.device_sn = md.device_sn::VARCHAR AND md.is_deleted = 0
+ left join wayline_job wj on ba.wayline_job_id = wj.job_id::VARCHAR
<where>
AND ba.is_deleted = 0
AND wj.job_info_id is not null
@@ -511,7 +511,7 @@
ba.original_name
FROM
wayline_job wj
- LEFT JOIN blade_attach ba ON wj.job_id = ba.wayline_job_id
+ LEFT JOIN blade_attach ba ON wj.job_id = ba.wayline_job_id::VARCHAR
WHERE wj.job_id = #{jobId}
AND job_type = 6
AND result_type = 1
@@ -534,7 +534,7 @@
FROM
odm_task_info oti
LEFT JOIN blade_attach ba ON CONCAT( oti.base_path, oti.vox_grid_tiles_path )= ba.NAME and ba.is_deleted = 0
- LEFT JOIN wayline_job wj ON wj.job_id = oti.wayline_job_id and wj.is_deleted = 0
+ LEFT JOIN wayline_job wj ON wj.job_id = oti.wayline_job_id::VARCHAR and wj.is_deleted = 0
WHERE
ba.id IS NULL
AND oti.is_deleted = 0
@@ -601,7 +601,7 @@
wj.area_code,wj.create_user,wj.update_user,wj.create_dept,
date_format(FROM_UNIXTIME( wj.completed_time/ 1000),'%Y-%m-%d %H:%i:%s') as completedTime
FROM odm_task_info oti
- left join wayline_job wj on oti.wayline_job_id = wj.job_id and wj.is_deleted = 0
+ left join wayline_job wj on oti.wayline_job_id = wj.job_id::VARCHAR and wj.is_deleted = 0
<where>
AND oti.is_deleted = 0
AND oti.STATUS = 40
--
Gitblit v1.9.3