From 631b1895a9a12ceace45fcd877d3f4e6fbf0885f Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Tue, 13 Jan 2026 11:18:27 +0800
Subject: [PATCH] 取消areaCode相关插入
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 74 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 1 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 631f5ae..5185494 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
@@ -53,6 +53,12 @@
<if test="param2.deviceSpecification != null and param2.deviceSpecification != ''">
and device_specification = #{param2.deviceSpecification}
</if>
+ <if test="param2.effectiveRangeKmIsNotNull != null and param2.effectiveRangeKmIsNotNull == 1">
+ and effective_range_km is not null
+ </if>
+ <if test="param2.effectiveRangeKmIsNotNull != null and param2.effectiveRangeKmIsNotNull == 2">
+ and effective_range_km is null
+ </if>
<if test="param2.manufacturer != null and param2.manufacturer != ''">
and manufacturer = #{param2.manufacturer}
</if>
@@ -61,6 +67,29 @@
</if>
<if test="param2.belongDept != null and param2.belongDept != ''">
and belong_dept = #{param2.belongDept}
+ </if>
+ <if test="param2.deviceStatusList != null and param2.deviceStatusList != ''">
+ and status in
+ <foreach item="item" collection="param2.deviceStatusList" separator="," open="(" close=")" index="">
+ #{item}
+ </foreach>
+ </if>
+ </where>
+ </select>
+
+ <select id="selectFwDeviceList" resultMap="fwDeviceResultMap">
+ select * from ja_fw_device
+ <where>
+ is_deleted = 0
+ <if test="isAreaSelect != null and isAreaSelect == 1">
+ and 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)
+ )
</if>
</where>
</select>
@@ -118,7 +147,50 @@
-- 雷达设备数量
(SELECT COUNT(*) FROM ja_fw_device WHERE is_deleted = 0 AND device_att = '3') AS radarCount,
-- 设备告警
- (SELECT COUNT(*) FROM ja_fw_device WHERE is_deleted = 0 AND status = '2') AS deviceAlarmCount;
+ (SELECT COUNT(*) FROM ja_fw_device WHERE is_deleted = 0 AND status in ('1', '2', '3') ) AS deviceAlarmCount;
+ </select>
+
+ <select id="selectCockpitDevicePage" resultType="org.sxkj.fw.device.vo.CockpitFwDeviceVO">
+ select
+ d.*,
+ fts.longitude,
+ fts.latitude
+ from
+ ja_fw_device d
+ left join ja_fw_task_schedule fts on d.id = fts.device_id
+ <where>
+ d.is_deleted = 0
+ <if test="param2.id != null and param2.id != ''">
+ and d.id = #{param2.id}
+ </if>
+ <if test="param2.deviceName != null and param2.deviceName != ''">
+ and d.device_name like concat('%',#{param2.deviceName},'%')
+ </if>
+ <if test="param2.deviceType != null and param2.deviceType != ''">
+ and d.device_type = #{param2.deviceType}
+ </if>
+ <if test="param2.deviceModel != null and param2.deviceModel != ''">
+ and d.device_model = #{param2.deviceModel}
+ </if>
+ <if test="param2.deviceSpecification != null and param2.deviceSpecification != ''">
+ and d.device_specification = #{param2.deviceSpecification}
+ </if>
+ <if test="param2.manufacturer != null and param2.manufacturer != ''">
+ and d.manufacturer = #{param2.manufacturer}
+ </if>
+ <if test="param2.source != null and param2.source != ''">
+ and d.source = #{param2.source}
+ </if>
+ <if test="param2.belongDept != null and param2.belongDept != ''">
+ and d.belong_dept = #{param2.belongDept}
+ </if>
+ <if test="param2.deviceStatusList != null and param2.deviceStatusList != ''">
+ and d.status in
+ <foreach item="item" collection="param2.deviceStatusList" separator="," open="(" close=")" index="">
+ #{item}
+ </foreach>
+ </if>
+ </where>
</select>
</mapper>
--
Gitblit v1.9.3