From 2e98f7678b2dab62f15ff1d0807281f7c9a3d075 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 09 Feb 2026 17:06:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml | 21 ++++++++++++++++++++-
1 files changed, 20 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 9ec475e..5ebbd1b 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>
@@ -51,7 +54,23 @@
<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
<where>
--
Gitblit v1.9.3