From bc1a6bb5bb2803ed6a5669a976bf2b47f3dacfca Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 14 Jan 2026 11:27:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 194 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 192 insertions(+), 2 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 a603709..9cf89bc 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
@@ -7,23 +7,119 @@
<result column="id" property="id"/>
<result column="device_name" property="deviceName"/>
<result column="device_type" property="deviceType"/>
+ <result column="device_att" property="deviceAtt"/>
<result column="device_model" property="deviceModel"/>
<result column="device_specification" property="deviceSpecification"/>
<result column="manufacturer" property="manufacturer"/>
<result column="source" property="source"/>
+ <result column="purpose" property="purpose"/>
+ <result column="belong_dept" property="belongDept"/>
+ <result column="charger" property="charger"/>
+ <result column="contact_phone" property="contactPhone"/>
<result column="remark" property="remark"/>
+ <result column="battery_pct" property="batteryPct"/>
+ <result column="azimuth" property="azimuth"/>
+ <result column="elevation" property="elevation"/>
+ <result column="detect_target_cnt" property="detectTargetCnt"/>
+ <result column="effective_range_km" property="effectiveRangeKm"/>
+ <result column="work_mode" property="workMode"/>
+ <result column="area_code" property="areaCode"/>
+ <result column="device_sn" property="deviceSn"/>
<result column="create_user" property="createUser"/>
<result column="create_dept" property="createDept"/>
<result column="create_time" property="createTime"/>
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
<result column="status" property="status"/>
- <result column="is_deleted" property="isDeleted"/>
+<!-- <result column="is_deleted" property="isDeleted"/>-->
</resultMap>
<select id="selectFwDevicePage" resultMap="fwDeviceResultMap">
- select * from ja_fw_device where is_deleted = 0
+ select * from ja_fw_device
+ <where>
+ is_deleted = 0
+ <if test="param2.id != null and param2.id != ''">
+ and id = #{param2.id}
+ </if>
+ <if test="param2.deviceName != null and param2.deviceName != ''">
+ and device_name like concat('%',#{param2.deviceName},'%')
+ </if>
+ <if test="param2.deviceType != null and param2.deviceType != ''">
+ and device_type = #{param2.deviceType}
+ </if>
+ <if test="param2.deviceModel != null and param2.deviceModel != ''">
+ and device_model = #{param2.deviceModel}
+ </if>
+ <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
+ and effective_range_km > 0
+ </if>
+ <if test="param2.effectiveRangeKmIsNotNull != null and param2.effectiveRangeKmIsNotNull == 2">
+ and (effective_range_km is null or effective_range_km = 0)
+ </if>
+ <if test="param2.manufacturer != null and param2.manufacturer != ''">
+ and manufacturer = #{param2.manufacturer}
+ </if>
+ <if test="param2.source != null and param2.source != ''">
+ and source = #{param2.source}
+ </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 (
+ <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)
+ )
+ 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}
+ )
+ </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)
+ )
+ </otherwise>
+ </choose>
+ )
+ </if>
+ </where>
</select>
@@ -31,4 +127,98 @@
SELECT * FROM ja_fw_device ${ew.customSqlSegment}
</select>
+ <!-- 统计设备类型（察打一体同时计入侦测和反制） -->
+ <select id="statisticalDeviceType" resultType="org.sxkj.fw.cockpit.vo.DeviceStatisticsVO">
+ SELECT
+ CASE split_device_type -- 自定义排序（可选）
+ WHEN '1' THEN '侦测设备'
+ WHEN '2' THEN '反制设备'
+ ELSE '其他'
+ END AS type,
+ COUNT(*) AS count
+ FROM (
+ -- 子查询：拆分察打一体设备为侦测/反制两类
+ SELECT
+ id,
+ CASE
+ WHEN device_type = '3' THEN '1' -- 察打一体拆分为侦测
+ ELSE device_type
+ END AS split_device_type
+ FROM ja_fw_device
+ WHERE is_deleted = 0 -- 排除已删除数据
+
+ UNION ALL -- 合并拆分的反制部分
+
+ SELECT
+ id,
+ CASE
+ WHEN device_type = '3' THEN '2' -- 察打一体拆分为反制
+ ELSE device_type
+ END AS split_device_type
+ FROM ja_fw_device
+ WHERE is_deleted = 0
+ AND device_type != '3' -- 避免普通设备重复统计
+ ) AS temp
+ GROUP BY split_device_type
+ ORDER BY split_device_type
+ </select>
+
+ <!-- 查询设备总数 + 无线电/光电/雷达设备数量 -->
+ <select id="statisticalDeviceAtt" resultType="org.sxkj.fw.cockpit.vo.AlarmStatisticsVO">
+ SELECT
+ -- 设备统计总数
+ (SELECT COUNT(*) FROM ja_fw_device WHERE is_deleted = 0) AS deviceCount,
+ -- 无线电设备数量
+ (SELECT COUNT(*) FROM ja_fw_device WHERE is_deleted = 0 AND device_att = '1') AS radioCount,
+ -- 光电设备数量
+ (SELECT COUNT(*) FROM ja_fw_device WHERE is_deleted = 0 AND device_att = '2') AS opticalCount,
+ -- 雷达设备数量
+ (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 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