From b954d7a119eb635394bf4ff3619a9ab4b4978e48 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 09:33:34 +0800
Subject: [PATCH] sql改造首页
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml | 74 ++++++++++++++++++++++++++++++++++--
1 files changed, 69 insertions(+), 5 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 ed9b4ff..752ffc8 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
@@ -15,6 +15,9 @@
<result column="effective_date_start" property="effectiveDateStart"/>
<result column="effective_date_end" property="effectiveDateEnd"/>
<result column="area_code" property="areaCode"/>
+ <result column="scene_type" property="sceneType"/>
+ <result column="area_count" property="areaCount"/>
+ <result column="device_count" property="deviceCount"/>
</resultMap>
@@ -23,11 +26,17 @@
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_defense_scene ds on ds.id = dsm.defense_scene_id::VARCHAR 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>
@@ -37,7 +46,7 @@
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_defense_scene ds on ds.id = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0
where dsm.is_deleted = 0
and dsm.id = #{id}
</select>
@@ -45,9 +54,25 @@
<select id="selectFwDefenseSceneManageList" resultMap="fwDefenseSceneManageResultMap">
select
dsm.*,
- ds.scene_name as defense_scene_name
+ ds.scene_name as defense_scene_name,
+ ds.scene_type as scene_type,
+ case
+ when ds.area_divide_ids is null or ds.area_divide_ids = '' then 0
+ else length(ds.area_divide_ids) - length(replace(ds.area_divide_ids, ',', '')) + 1
+ end as area_count,
+ (
+ select ifnull(sum(
+ case
+ when ad.device_ids is null or ad.device_ids = '' then 0
+ else length(ad.device_ids) - length(replace(ad.device_ids, ',', '')) + 1
+ end
+ ), 0)
+ from ja_fw_area_divide ad
+ where ad.is_deleted = 0
+ and find_in_set(ad.id, ds.area_divide_ids) > 0
+ ) as device_count
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_defense_scene ds on ds.id = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0
<where>
dsm.is_deleted = 0
<if test="time != null">
@@ -77,11 +102,50 @@
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_defense_scene ds ON ds.id = dsm.defense_scene_id::VARCHAR AND ds.is_deleted = 0
LEFT JOIN ja_fw_area_divide ad ON FIND_IN_SET(ad.id, ds.area_divide_ids) > 0 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::VARCHAR and ds.is_deleted = 0
+ left join ja_fw_area_divide ad on FIND_IN_SET(ad.id, ds.area_divide_ids) > 0 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="fwBaseInfo.regionCode != null and fwBaseInfo.regionCode != ''">
+ and ( d.final_outbound_area_code like concat(#{fwBaseInfo.regionCode},'%')
+ <if test="fwBaseInfo.currentDeptId != null and fwBaseInfo.currentDeptId != '' ">
+ or d.id in (
+ SELECT device_id FROM ja_fw_device_per_share
+ WHERE loan_to_dept_id = #{fwBaseInfo.currentDeptId}
+ AND is_deleted = 0
+ )
+ </if>
+ )
+ </if>
+ GROUP BY
+ d.id
+ ) dd on find_in_set(dd.id, ad.device_ids)
+ <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>
+
</mapper>
--
Gitblit v1.9.3