From 74b5d54c1cf5dc585a2fe135f4ce4dd2b374b4dd Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Tue, 03 Feb 2026 15:55:35 +0800
Subject: [PATCH] 设备列表查询新增多个区域信息
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 100 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 74 insertions(+), 26 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..cc36953 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
@@ -106,11 +106,37 @@
is_deleted = 0
<if test="isAreaSelect != null and isAreaSelect == 1">
and (
- <choose>
- <when test="areaId != null">
- exists (
- select 1
- from ja_fw_area_divide ad
+ <choose>
+ <when test="areaIds != null and areaIds.size > 0">
+ 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)
+ )
+ 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
@@ -250,8 +276,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 +307,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 (
@@ -338,10 +364,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>
@@ -393,8 +415,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 +437,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 +458,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 +478,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 +498,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 (
@@ -499,8 +521,8 @@
<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}
+ <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 (
@@ -563,7 +585,8 @@
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 +615,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