From 0b5742177d3a663435da88c77f21c9a2649b4967 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 09 Feb 2026 15:19:24 +0800
Subject: [PATCH] 机构导入优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 2810e63..12eb6af 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
@@ -27,8 +27,8 @@
blade_dept bd on md.create_dept = bd.id
<where>
and md.is_deleted = 0
- <if test="param2.deviceName != null and param2.deviceName != ''">
- and md.nickname like concat('%',#{param2.deviceName},'%')
+ <if test="param2.nickname != null and param2.nickname != ''">
+ and md.nickname like concat('%',#{param2.nickname},'%')
</if>
<if test="param2.deptId != null">
and md.create_dept = #{param2.deptId}
@@ -36,6 +36,13 @@
<if test="param2.location != null and param2.location != ''">
and md.location like concat('%',#{param2.location},'%')
</if>
+ <if test="param2.modeCode != null and param2.modeCode != ''">
+ and md.mode_code = #{param2.modeCode}
+ </if>
+ <if test="param2.deviceType != null and param2.deviceType != ''">
+ and md.device_type = #{param2.deviceType}
+ </if>
+
</where>
</select>
@@ -72,7 +79,10 @@
and md.device_payload like concat('%',#{devicePayload},'%')
</if>
<if test="geom != null and geom != ''">
- and ST_Intersects(md.geom, ST_GeomFromText(#{geom}))
+ and ST_Intersects(md.geom, ST_GeomFromText(#{geom}, 4326))
+ </if>
+ <if test="deviceType != null and deviceType != '' ">
+ and md.device_type = #{deviceType}
</if>
and md.is_deleted = 0
</where>
--
Gitblit v1.9.3