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 | 193 +++++++++++++++++++++++++++++++++---------------
1 files changed, 132 insertions(+), 61 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 d44b2e0..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,54 +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">
+ 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 ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
+ )
+ )
+ </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 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 = #{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>
@@ -168,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
@@ -176,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>
@@ -187,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>
@@ -250,8 +279,8 @@
d.is_deleted = 0
AND d.is_enabled = 1
AND status != 3
- <if test="regionName != null and regionName != ''">
- and (d.final_outbound_area = #{regionName}
+ <if test="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like concat(#{regionCode}, '%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -281,8 +310,8 @@
AND is_enabled = 1
AND status != 3
AND device_type = '3'
- <if test="regionName != null and regionName != ''">
- and (d.final_outbound_area = #{regionName}
+ <if test="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like concat(#{regionCode}, '%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -315,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
@@ -338,10 +367,6 @@
d.is_deleted = 0
AND d.is_enabled = 1
AND d.final_outbound_area IS NOT NULL
- <!-- <if test="effectiveRangeKmIsNotNull != null and effectiveRangeKmIsNotNull == 1"> -->
- <!-- and d.effective_range_km is not null -->
- <!-- and d.effective_range_km > 0 -->
- <!-- </if> -->
<if test="effectiveRangeKmIsNotNull != null and effectiveRangeKmIsNotNull == 2">
and (d.effective_range_km is null or d.effective_range_km = 0)
</if>
@@ -373,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
@@ -393,8 +426,8 @@
WHERE
d.is_deleted = 0
and d.is_enabled = 1
- <if test="regionName != null and regionName != ''">
- and (d.final_outbound_area = #{regionName}
+ <if test="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like concat(#{regionCode},'%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -415,8 +448,8 @@
d.is_deleted = 0
and d.is_enabled = 1
AND device_att = '1'
- <if test="regionName != null and regionName != ''">
- and (d.final_outbound_area = #{regionName}
+ <if test="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like concat(#{regionCode},'%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -436,8 +469,8 @@
WHERE d.is_deleted = 0
and d.is_enabled = 1
AND device_att = '2'
- <if test="regionName != null and regionName != ''">
- and (d.final_outbound_area = #{regionName}
+ <if test="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like concat(#{regionCode},'%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -456,8 +489,8 @@
WHERE d.is_deleted = 0
and d.is_enabled = 1
AND device_att = '3'
- <if test="regionName != null and regionName != ''">
- and (d.final_outbound_area = #{regionName}
+ <if test="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like concat(#{regionCode},'%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -476,8 +509,8 @@
WHERE d.is_deleted = 0
and d.is_enabled = 1
AND status in ('1', '2', '3' )
- <if test="regionName != null and regionName != ''">
- and (d.final_outbound_area = #{regionName}
+ <if test="regionCode != null and regionCode != ''">
+ and (d.final_outbound_area_code like concat(#{regionCode},'%')
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -493,14 +526,25 @@
<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
- <if test="param2.regionName != null and param2.regionName != ''">
- and (d.final_outbound_area = #{param2.regionName}
+ 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},'%')
<!-- 或者设备是共享给当前部门的 -->
<if test="param2.currentDeptId != null and param2.currentDeptId != '' ">
or d.id in (
@@ -557,13 +601,15 @@
</foreach>
</if>
</where>
+ group by d.id
</select>
<update id="updateTrackStatusByDeviceId">
update
ja_fw_device
set track_status = #{trackStatus},
- final_outbound_area = #{outTarget}
+ final_outbound_area = #{outTarget},
+ final_outbound_area_code = #{outTargetCode}
where id = #{deviceId}
and is_deleted = 0
</update>
@@ -592,4 +638,29 @@
AND d.final_outbound_area != #{regionName}
</select>
+ <select id="getDeviceStatistics" resultType="org.sxkj.fw.cockpit.vo.DeviceStatisticsVO">
+ SELECT
+ d.final_outbound_area AS type,
+ COUNT(*) AS count
+ FROM
+ ja_fw_device d
+ WHERE
+ d.is_deleted = 0
+ AND d.is_enabled = 1
+ AND d.final_outbound_area IS NOT NULL
+ <if test="regionCode != null and regionCode != ''">
+ and ( d.final_outbound_area_code like concat(#{regionCode},'%')
+ <if test="currentDeptId != null and currentDeptId != '' ">
+ or d.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
+ d.final_outbound_area
+ </select>
+
</mapper>
--
Gitblit v1.9.3