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 | 157 ++++++++++++++++++++++++++++++----------------------
1 files changed, 90 insertions(+), 67 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 cc36953..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
@@ -44,7 +44,7 @@
from
ja_fw_device
<where>
- is_deleted = 0
+ is_deleted = 0
<if test="param2.id != null and param2.id != ''">
and id = #{param2.id}
</if>
@@ -92,80 +92,83 @@
and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) = 0
</if>
<if test="param2.deptList != null and param2.deptList.size > 0">
- and create_dept in
+ and ( create_dept in
<foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
+ <!-- 或者设备是共享给当前部门的 -->
+ <if test="param2.currentDeptId != null and param2.currentDeptId != '' ">
+ or id in (
+ SELECT device_id FROM ja_fw_device_per_share
+ WHERE loan_to_dept_id = #{param2.currentDeptId}
+ AND is_deleted = 0
+ )
+ </if>
+ )
</if>
</where>
+ order by
+ create_time desc
</select>
<select id="selectFwDeviceList" resultMap="fwDeviceResultMap">
select * from ja_fw_device
<where>
is_deleted = 0
- <if test="isAreaSelect != null and isAreaSelect == 1">
- and (
- <choose>
- <when test="areaIds != null and areaIds.size > 0">
+ <choose>
+ <when test="areaIds != null and areaIds.size > 0">
+ and (
exists (
- select 1
- from ja_fw_area_divide ad
- where ad.is_deleted = 0
- and ad.id in
- <foreach collection="areaIds" item="areaIdItem" separator="," open="(" close=")">
- #{areaIdItem}
- </foreach>
- and ad.device_ids is not null
- and ad.device_ids != ''
- and find_in_set(ja_fw_device.id, ad.device_ids)
+ select 1
+ from ja_fw_area_divide ad
+ where ad.is_deleted = 0
+ and ad.id in
+ <foreach collection="areaIds" item="areaIdItem" separator="," open="(" close=")">
+ #{areaIdItem}
+ </foreach>
+ and ad.device_ids is not null
+ and ad.device_ids != ''
+ and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
)
- or not exists (
- select 1
- from ja_fw_area_divide ad
- 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 ad.id not in
- <foreach collection="areaIds" item="areaIdItem" separator="," open="(" close=")">
- #{areaIdItem}
- </foreach>
- )
- </when>
- <when test="areaId != null">
- exists (
- select 1
- from ja_fw_area_divide ad
- where ad.is_deleted = 0
- 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)
+ )
+ </when>
+ <when test="isAreaSelect != null and isAreaSelect == 1">
+ and (
+ <choose>
+ <when test="areaId != null">
+ exists (
+ select 1
+ from ja_fw_area_divide ad
+ where ad.is_deleted = 0
+ and ad.id = #{areaId}
+ and ad.device_ids is not null
+ and ad.device_ids != ''
+ and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
)
or not exists (
- select 1
- from ja_fw_area_divide ad
- 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 ad.id != #{areaId}
+ select 1
+ from ja_fw_area_divide ad
+ where ad.is_deleted = 0
+ and ad.device_ids is not null
+ and ad.device_ids != ''
+ and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
+ and ad.id != #{areaId}
)
</when>
<otherwise>
not exists (
- select 1
- from ja_fw_area_divide ad
- 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)
+ select 1
+ from ja_fw_area_divide ad
+ where ad.is_deleted = 0
+ and ad.device_ids is not null
+ and ad.device_ids != ''
+ and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
)
</otherwise>
</choose>
- )
- </if>
+ )
+ </when>
+ </choose>
<if test="status != null">
and status = #{status}
</if>
@@ -194,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
@@ -202,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>
@@ -213,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>
@@ -341,13 +344,13 @@
<foreach collection="deptList" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
- <!-- <if test="currentDeptId != null and currentDeptId != '' "> -->
- <!-- or a.id in ( -->
- <!-- SELECT device_id FROM ja_fw_device_per_share -->
- <!-- WHERE loan_to_dept_id = #{currentDeptId} -->
- <!-- AND is_deleted = 0 -->
- <!-- ) -->
- <!-- </if> -->
+ <if test="currentDeptId != null and currentDeptId != '' ">
+ or a.id in (
+ SELECT device_id FROM ja_fw_device_per_share
+ WHERE loan_to_dept_id = #{currentDeptId}
+ AND is_deleted = 0
+ )
+ </if>
)
</if>
group by a.device_type,b.dict_value
@@ -395,10 +398,18 @@
WHERE
is_deleted = 0
<if test="deptList != null and deptList.size > 0">
- and create_dept in
+ and ( create_dept in
<foreach collection="deptList" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
+ <if test="currentDeptId != null and currentDeptId != '' ">
+ or id in (
+ SELECT device_id FROM ja_fw_device_per_share
+ WHERE loan_to_dept_id = #{currentDeptId}
+ AND is_deleted = 0
+ )
+ </if>
+ )
</if>
GROUP BY
manufacturer
@@ -515,12 +526,23 @@
<select id="selectCockpitDevicePage" resultType="org.sxkj.fw.device.vo.CockpitFwDeviceVO">
select
- d.*
+ d.*,
+ min(ad.id) as area_divide_id,
+ min(dsm.id) as defense_scene_manage_id
from
ja_fw_device d
+ left join ja_fw_area_divide ad
+ on d.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
+ and ad.is_deleted = 0
+ left join ja_fw_defense_scene ds
+ 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
+ and dsm.is_deleted = 0
<where>
- d.is_deleted = 0
- and d.is_enabled = 1
+ d.is_deleted = 0
+ and d.is_enabled = 1
<if test="param2.regionCode != null and param2.regionCode != ''">
and (d.final_outbound_area_code like concat(#{param2.regionCode},'%')
<!-- 或者设备是共享给当前部门的 -->
@@ -579,6 +601,7 @@
</foreach>
</if>
</where>
+ group by d.id
</select>
<update id="updateTrackStatusByDeviceId">
--
Gitblit v1.9.3