From ebeb43ea497fafc448c827d1de6796bcaa4e0b52 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 23 Jun 2026 13:59:46 +0800
Subject: [PATCH] add : 吉安支持查询待验收的接口
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
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 b2c1af4..bc09b5d 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
@@ -58,35 +58,39 @@
<select id="selectGdManageDevice" resultType="org.sxkj.gd.workorder.vo.GdManageDeviceVO">
select
- md.id,
- md.device_sn,
- md.device_name,
- md.nickname,
- md.device_payload,
- md.longitude,
- md.latitude,
- md.geom,
- d2.height as height
+ md.id,
+ md.device_sn,
+ md.device_name,
+ md.nickname,
+ md.device_payload,
+ md.longitude,
+ md.latitude,
+ md.geom,
+ d2.height as height
from
- ja_gd_manage_device md
- left join ja_gd_manage_device d2 on md.device_sn::VARCHAR = d2.device_sn::VARCHAR and d2.device_type = '0'
+ ja_gd_manage_device md
+ left join ja_gd_manage_device d2
+ on md.device_sn::text = d2.device_sn::text
+ and d2.device_type = '0'
<where>
+ md.is_deleted = 0
+ AND md.child_sn IS NOT NULL
+ AND trim(md.child_sn) != ''
<if test="deviceIds != null and deviceIds.size() > 0">
- and md.id in
+ and md.id::text in
<foreach item="item" collection="deviceIds" index="index" open="(" close=")" separator=",">
- #{item}
+ #{item}::text
</foreach>
</if>
<if test="devicePayload != null and devicePayload != ''">
- and md.device_payload like concat('%',#{devicePayload},'%')
+ and md.device_payload like concat('%', #{devicePayload}, '%')
</if>
<if test="geom != null and geom != ''">
- and ST_Intersects(md.geom, ST_GeomFromText(#{geom}))
+ AND public.st_intersects ( md.geom, public.st_geomfromtext(#{geom}::text, 4326))
</if>
<if test="deviceType != null and deviceType != '' ">
- and md.device_type = #{deviceType}
+ and md.device_type::text = #{deviceType}::text
</if>
- and md.is_deleted = 0
</where>
</select>
--
Gitblit v1.9.3