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/area/mapper/FwDefenseSceneManageMapper.xml | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 100 insertions(+), 1 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml
index ab92fe0..05eb43d 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml
@@ -6,6 +6,7 @@
<resultMap id="fwDefenseSceneManageResultMap" type="org.sxkj.fw.area.vo.FwDefenseSceneManageVO">
<result column="id" property="id"/>
<result column="defense_scene_id" property="defenseSceneId"/>
+ <result column="defense_scene_name" property="defenseSceneName"/>
<result column="scene_name" property="sceneName"/>
<result column="longitude" property="longitude"/>
<result column="latitude" property="latitude"/>
@@ -18,7 +19,48 @@
<select id="selectFwDefenseSceneManagePage" resultMap="fwDefenseSceneManageResultMap">
- select * from ja_fw_defense_scene_manage where is_deleted = 0
+ select
+ dsm.*,
+ ds.scene_name as defense_scene_name
+ from ja_fw_defense_scene_manage dsm
+ left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id and ds.is_deleted = 0
+ <where>
+ dsm.is_deleted = 0
+ <if test="param2.name != null and param2.name != ''">
+ and dsm.scene_name like concat('%', #{param2.name}, '%')
+ </if>
+ <if test="param2.deptList != null and param2.deptList.size > 0">
+ and dsm.create_dept in
+ <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
+ </where>
+ </select>
+
+ <select id="selectFwDefenseSceneManageDetail" resultMap="fwDefenseSceneManageResultMap">
+ select
+ dsm.*,
+ ds.scene_name as defense_scene_name
+ from ja_fw_defense_scene_manage dsm
+ left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id and ds.is_deleted = 0
+ where dsm.is_deleted = 0
+ and dsm.id = #{id}
+ </select>
+
+ <select id="selectFwDefenseSceneManageList" resultMap="fwDefenseSceneManageResultMap">
+ select
+ dsm.*,
+ ds.scene_name as defense_scene_name
+ from ja_fw_defense_scene_manage dsm
+ left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id and ds.is_deleted = 0
+ <where>
+ dsm.is_deleted = 0
+ <if test="time != null">
+ and (dsm.effective_date_start is null or dsm.effective_date_start <= #{time})
+ and (dsm.effective_date_end is null or dsm.effective_date_end >= #{time})
+ </if>
+ </where>
</select>
@@ -26,4 +68,61 @@
SELECT * FROM ja_fw_defense_scene_manage ${ew.customSqlSegment}
</select>
+ <select id="selectDeviceId" parameterType="java.lang.Long" resultType="java.lang.Long">
+ <!-- 步骤1: 根据输入的ja_fw_defense_scene_manage.id获取对应的defense_scene_id -->
+ <!-- 步骤2: 通过defense_scene_id获取ja_fw_defense_scene中的area_divide_ids -->
+ <!-- 步骤3: 根据area_divide_ids获取所有ja_fw_area_divide记录的device_ids -->
+ <!-- 步骤4: 解析逗号分隔的device_ids并返回所有设备ID -->
+ SELECT DISTINCT CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(ad.device_ids, ',', numbers.n), ',', -1) AS UNSIGNED) AS device_id
+ FROM (
+ SELECT 1 n UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5
+ UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9 UNION ALL SELECT 10
+ UNION ALL SELECT 11 UNION ALL SELECT 12 UNION ALL SELECT 13 UNION ALL SELECT 14 UNION ALL SELECT 15
+ ) numbers
+ INNER JOIN (
+ SELECT
+ ad.device_ids
+ FROM ja_fw_defense_scene_manage dsm
+ LEFT JOIN ja_fw_defense_scene ds ON ds.id = dsm.defense_scene_id AND ds.is_deleted = 0
+ LEFT JOIN ja_fw_area_divide ad ON ad.id = ANY(string_to_array(ds.area_divide_ids, ',')::bigint[]) AND ad.is_deleted = 0
+ WHERE dsm.id = #{id}
+ ) ad ON CHAR_LENGTH(ad.device_ids) - CHAR_LENGTH(REPLACE(ad.device_ids, ',', '')) >= numbers.n - 1
+ WHERE ad.device_ids IS NOT NULL AND ad.device_ids != ''
+ </select>
+
+ <select id="selectFwDefenseSceneManageCockpitList" resultType="org.sxkj.fw.area.vo.FwDefenseSceneManageVO">
+ select
+ dsm.*,
+ ds.scene_name as defense_scene_name
+ from ja_fw_defense_scene_manage dsm
+ left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id and ds.is_deleted = 0
+ left join ja_fw_area_divide ad on ad.id = ANY(string_to_array(ds.area_divide_ids, ',')::bigint[]) and ad.is_deleted = 0
+ inner join (
+ SELECT
+ d.id
+ 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.id
+ ) dd on dd.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
+ <where>
+ dsm.is_deleted = 0
+ </where>
+ </select>
+
</mapper>
--
Gitblit v1.9.3