From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 261 ++++++++++-----------------------------------------
1 files changed, 54 insertions(+), 207 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 b2175a9..d44b2e0 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
@@ -156,6 +156,7 @@
select * from ja_fw_device
<where>
is_deleted = 0
+ and track_status = 1
<if test="query.isAreaSelect != null and query.isAreaSelect == 1">
and (
<choose>
@@ -245,29 +246,12 @@
split_device_type
FROM
ja_fw_device d
- LEFT JOIN (
- SELECT
- device_id,
- out_target,
- ROW_NUMBER() OVER (
- PARTITION BY
- device_id
- ORDER BY
- create_time DESC
- ) AS rn
- FROM
- ja_fw_device_track
- WHERE
- out_target IS NOT NULL
- ) t ON d.id = t.device_id AND t.rn = 1
WHERE
d.is_deleted = 0
- AND status != 3
- AND track_status = 1
- AND effective_range_km is not null
- AND effective_range_km > 0
+ AND d.is_enabled = 1
+ AND status != 3
<if test="regionName != null and regionName != ''">
- and (t.out_target = #{regionName}
+ and (d.final_outbound_area = #{regionName}
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -292,30 +276,13 @@
split_device_type
FROM
ja_fw_device d
- LEFT JOIN (
- SELECT
- device_id,
- out_target,
- ROW_NUMBER() OVER (
- PARTITION BY
- device_id
- ORDER BY
- create_time DESC
- ) AS rn
- FROM
- ja_fw_device_track
- WHERE
- out_target IS NOT NULL
- ) t ON d.id = t.device_id AND t.rn = 1
WHERE
d.is_deleted = 0
- AND status != 3
- AND device_type = '3'
- AND track_status = 1
- AND effective_range_km is not null
- AND effective_range_km > 0
+ AND is_enabled = 1
+ AND status != 3
+ AND device_type = '3'
<if test="regionName != null and regionName != ''">
- and (t.out_target = #{regionName}
+ and (d.final_outbound_area = #{regionName}
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -344,10 +311,18 @@
blade_dict_biz b ON (a.device_type = b.dict_key AND b.code = 'deviceType' AND b.parent_id != 0)
where a.is_deleted = 0
<if test="deptList != null and deptList.size > 0">
- and a.create_dept in
+ and ( a.create_dept in
<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>
group by a.device_type,b.dict_value
</select>
@@ -355,44 +330,37 @@
<!-- 设备出库去向统计 -->
<select id="getDeviceOutStatistics" resultType="org.sxkj.fw.cockpit.vo.DeviceStatisticsVO">
SELECT
- t.out_target AS type,
+ d.final_outbound_area AS type,
COUNT(*) AS count
FROM
ja_fw_device d
- LEFT JOIN (
- SELECT
- device_id,
- out_target,
- ROW_NUMBER() OVER (
- PARTITION BY
- device_id
- ORDER BY
- create_time DESC
- ) AS rn
- FROM
- ja_fw_device_track
- WHERE
- out_target IS NOT NULL
- ) t ON d.id = t.device_id
- AND t.rn = 1
WHERE
d.is_deleted = 0
- AND t.out_target 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>
+ 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>
<if test="deptList != null and deptList.size > 0">
- and d.create_dept in
+ and ( d.create_dept in
<foreach collection="deptList" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
+ <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
- t.out_target
+ d.final_outbound_area
</select>
<!-- 设备生产厂商统计 -->
@@ -422,29 +390,11 @@
COUNT(*)
FROM
ja_fw_device d
- LEFT JOIN (
- SELECT
- device_id,
- out_target,
- ROW_NUMBER() OVER (
- PARTITION BY
- device_id
- ORDER BY
- create_time DESC
- ) AS rn
- FROM
- ja_fw_device_track
- WHERE
- out_target IS NOT NULL
- ) t
- ON d.id = t.device_id AND t.rn = 1
WHERE
d.is_deleted = 0
- and effective_range_km is not null
- and effective_range_km > 0
- AND track_status = 1
+ and d.is_enabled = 1
<if test="regionName != null and regionName != ''">
- and (t.out_target = #{regionName}
+ and (d.final_outbound_area = #{regionName}
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -461,30 +411,12 @@
COUNT(*)
FROM
ja_fw_device d
- LEFT JOIN (
- SELECT
- device_id,
- out_target,
- ROW_NUMBER() OVER (
- PARTITION BY
- device_id
- ORDER BY
- create_time DESC
- ) AS rn
- FROM
- ja_fw_device_track
- WHERE
- out_target IS NOT NULL
- ) t
- ON d.id = t.device_id AND t.rn = 1
WHERE
d.is_deleted = 0
+ and d.is_enabled = 1
AND device_att = '1'
- and effective_range_km is not null
- and effective_range_km > 0
- AND track_status = 1
<if test="regionName != null and regionName != ''">
- and (t.out_target = #{regionName}
+ and (d.final_outbound_area = #{regionName}
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -501,29 +433,11 @@
COUNT(*)
FROM
ja_fw_device d
- LEFT JOIN (
- SELECT
- device_id,
- out_target,
- ROW_NUMBER() OVER (
- PARTITION BY
- device_id
- ORDER BY
- create_time DESC
- ) AS rn
- FROM
- ja_fw_device_track
- WHERE
- out_target IS NOT NULL
- ) t
- ON d.id = t.device_id AND t.rn = 1
WHERE d.is_deleted = 0
+ and d.is_enabled = 1
AND device_att = '2'
- and effective_range_km is not null
- and effective_range_km > 0
- AND track_status = 1
<if test="regionName != null and regionName != ''">
- and (t.out_target = #{regionName}
+ and (d.final_outbound_area = #{regionName}
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -539,29 +453,11 @@
(SELECT
COUNT(*)
FROM ja_fw_device d
- LEFT JOIN (
- SELECT
- device_id,
- out_target,
- ROW_NUMBER() OVER (
- PARTITION BY
- device_id
- ORDER BY
- create_time DESC
- ) AS rn
- FROM
- ja_fw_device_track
- WHERE
- out_target IS NOT NULL
- ) t
- ON d.id = t.device_id AND t.rn = 1
WHERE d.is_deleted = 0
+ and d.is_enabled = 1
AND device_att = '3'
- and effective_range_km is not null
- and effective_range_km > 0
- AND track_status = 1
<if test="regionName != null and regionName != ''">
- and (t.out_target = #{regionName}
+ and (d.final_outbound_area = #{regionName}
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -576,30 +472,12 @@
-- 设备告警
(SELECT
COUNT(*)
- FROM ja_fw_device d
- LEFT JOIN (
- SELECT
- device_id,
- out_target,
- ROW_NUMBER() OVER (
- PARTITION BY
- device_id
- ORDER BY
- create_time DESC
- ) AS rn
- FROM
- ja_fw_device_track
- WHERE
- out_target IS NOT NULL
- ) t
- ON d.id = t.device_id AND t.rn = 1
+ FROM ja_fw_device d
WHERE d.is_deleted = 0
+ and d.is_enabled = 1
AND status in ('1', '2', '3' )
- and effective_range_km is not null
- and effective_range_km > 0
- AND track_status = 1
<if test="regionName != null and regionName != ''">
- and (t.out_target = #{regionName}
+ and (d.final_outbound_area = #{regionName}
<!-- 或者设备是共享给当前部门的 -->
<if test="currentDeptId != null and currentDeptId != '' ">
or d.id in (
@@ -618,29 +496,11 @@
d.*
from
ja_fw_device d
- LEFT JOIN (
- SELECT
- device_id,
- out_target,
- ROW_NUMBER() OVER (
- PARTITION BY
- device_id
- ORDER BY
- create_time DESC
- ) AS rn
- FROM
- ja_fw_device_track
- WHERE
- out_target IS NOT NULL
- ) t
- ON d.id = t.device_id AND t.rn = 1
<where>
d.is_deleted = 0
- and d.effective_range_km is not null
- and d.effective_range_km > 0
- and d.track_status = 1
+ and d.is_enabled = 1
<if test="param2.regionName != null and param2.regionName != ''">
- and (t.out_target = #{param2.regionName}
+ and (d.final_outbound_area = #{param2.regionName}
<!-- 或者设备是共享给当前部门的 -->
<if test="param2.currentDeptId != null and param2.currentDeptId != '' ">
or d.id in (
@@ -700,8 +560,10 @@
</select>
<update id="updateTrackStatusByDeviceId">
- update ja_fw_device
- set track_status = #{trackStatus}
+ update
+ ja_fw_device
+ set track_status = #{trackStatus},
+ final_outbound_area = #{outTarget}
where id = #{deviceId}
and is_deleted = 0
</update>
@@ -710,7 +572,7 @@
<select id="selectNonDeptAreaDevices" resultType="org.sxkj.fw.device.vo.FwDeviceVO">
SELECT
d.*,
- t.out_target,
+ d.final_outbound_area as outTarget,
ps.id AS shareId,
CASE
WHEN ps.id IS NOT NULL THEN TRUE
@@ -718,31 +580,16 @@
END AS isShared
FROM
ja_fw_device d
- LEFT JOIN (
- SELECT
- device_id,
- out_target,
- ROW_NUMBER() OVER (
- PARTITION BY
- device_id
- ORDER BY
- create_time DESC
- ) AS rn
- FROM
- ja_fw_device_track
- WHERE
- out_target IS NOT NULL
- ) t ON d.id = t.device_id
- AND t.rn = 1
LEFT JOIN ja_fw_device_per_share ps ON ps.device_id = d.id
AND ps.loan_to_dept_id = #{currentDeptId}
AND ps.is_deleted = 0
WHERE
d.is_deleted = 0
+ and d.is_enabled = 1
and d.effective_range_km is not null
and d.effective_range_km > 0
and d.track_status = 1
- AND t.out_target != #{regionName}
+ AND d.final_outbound_area != #{regionName}
</select>
</mapper>
--
Gitblit v1.9.3