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-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
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 29dd3fa..c2f1291 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
@@ -107,6 +107,8 @@
)
</if>
</where>
+ order by
+ create_time desc
</select>
<select id="selectFwDeviceList" resultMap="fwDeviceResultMap">
@@ -126,7 +128,7 @@
</foreach>
and ad.device_ids is not null
and ad.device_ids != ''
- and find_in_set(ja_fw_device.id, ad.device_ids)
+ and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
)
)
</when>
@@ -141,7 +143,7 @@
and ad.id = #{areaId}
and ad.device_ids is not null
and ad.device_ids != ''
- and find_in_set(ja_fw_device.id, ad.device_ids)
+ and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
)
or not exists (
select 1
@@ -149,7 +151,7 @@
where ad.is_deleted = 0
and ad.device_ids is not null
and ad.device_ids != ''
- and find_in_set(ja_fw_device.id, ad.device_ids)
+ and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
and ad.id != #{areaId}
)
</when>
@@ -160,7 +162,7 @@
where ad.is_deleted = 0
and ad.device_ids is not null
and ad.device_ids != ''
- and find_in_set(ja_fw_device.id, ad.device_ids)
+ and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
)
</otherwise>
</choose>
@@ -195,7 +197,7 @@
and ad.id = #{query.areaId}
and ad.device_ids is not null
and ad.device_ids != ''
- and find_in_set(ja_fw_device.id, ad.device_ids)
+ and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
)
or not exists (
select 1
@@ -203,7 +205,7 @@
where ad.is_deleted = 0
and ad.device_ids is not null
and ad.device_ids != ''
- and find_in_set(ja_fw_device.id, ad.device_ids)
+ and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
and ad.id != #{query.areaId}
)
</when>
@@ -214,7 +216,7 @@
where ad.is_deleted = 0
and ad.device_ids is not null
and ad.device_ids != ''
- and find_in_set(ja_fw_device.id, ad.device_ids)
+ and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
)
</otherwise>
</choose>
@@ -530,10 +532,10 @@
from
ja_fw_device d
left join ja_fw_area_divide ad
- on find_in_set(d.id, ad.device_ids) > 0
+ on d.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
and ad.is_deleted = 0
left join ja_fw_defense_scene ds
- on find_in_set(ad.id, ds.area_divide_ids) > 0
+ on ad.id = ANY(string_to_array(replace(ds.area_divide_ids, ' ', ''), ',')::bigint[])
and ds.is_deleted = 0
left join ja_fw_defense_scene_manage dsm
on dsm.defense_scene_id = ds.id
--
Gitblit v1.9.3