From 779853ab6e4564e4d49d2f2a5a2c74d62da97be0 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 31 Jan 2026 17:40:36 +0800
Subject: [PATCH] 返回设备高度
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml | 35 +++++++++++++----------------------
1 files changed, 13 insertions(+), 22 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 6e1b1f4..4698e59 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
@@ -19,15 +19,7 @@
<select id="selectGdManageDevicePage" resultMap="gdManageDeviceResultMap">
select
- md.id,
- md.device_sn,
- md.device_name,
- md.nickname,
- md.mode_code,
- md.device_payload,
- md.longitude,
- md.latitude,
- md.location,
+ md.*,
bd.dept_name as device_dept_name
from
ja_gd_manage_device md
@@ -36,10 +28,7 @@
<where>
and md.is_deleted = 0
<if test="param2.deviceName != null and param2.deviceName != ''">
- and md.device_name like concat('%',#{param2.deviceName},'%')
- </if>
- <if test="param2.nickname != null and param2.nickname != ''">
- and md.nickname like concat('%',#{param2.nickname},'%')
+ and md.nickname like concat('%',#{param2.deviceName},'%')
</if>
<if test="param2.deptId != null">
and md.create_dept = #{param2.deptId}
@@ -60,16 +49,18 @@
<select id="selectGdManageDevice" resultType="org.sxkj.gd.workorder.vo.GdManageDeviceVO">
select
- id,
- device_sn,
- device_name,
- nickname,
- device_payload,
- longitude,
- latitude,
- geom
+ d.id,
+ d.device_sn,
+ d.device_name,
+ d.nickname,
+ d.device_payload,
+ d.longitude,
+ d.latitude,
+ d.geom,
+ d2.height as height
from
- ja_gd_manage_device
+ ja_gd_manage_device d
+ left join ja_gd_manage_device d2 on d.device_sn = d2.device_sn and d2.device_type = '0'
<where>
<if test="deviceIds != null and deviceIds.size() > 0">
and id in
--
Gitblit v1.9.3