From 74756c657109a4e48dd6c0b4d8959cdab89b33a9 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 28 Jan 2026 20:10:29 +0800
Subject: [PATCH] update-区域划分表结构调整
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 8 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml
index 94988cc..41ebd01 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.sxkj.fw.area.mapper.FwDefenseSceneMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="fwDefenseSceneResultMap" type="org.sxkj.fw.area.entity.FwDefenseSceneEntity">
+ <resultMap id="fwDefenseSceneResultMap" type="org.sxkj.fw.area.vo.FwDefenseSceneVO">
<result column="id" property="id"/>
<result column="scene_name" property="sceneName"/>
<result column="scene_type" property="sceneType"/>
@@ -14,7 +14,6 @@
<result column="defense_area" property="defenseArea"/>
<result column="device_mode" property="deviceMode"/>
<result column="area_divide_ids" property="areaDivideIds"/>
- <result column="device_ids" property="deviceIds"/>
<result column="area_code" property="areaCode"/>
<result column="create_user" property="createUser"/>
<result column="create_dept" property="createDept"/>
@@ -22,14 +21,16 @@
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
<result column="status" property="status"/>
- <result column="is_deleted" property="isDeleted"/>
</resultMap>
<select id="selectFwDefenseScenePage" resultMap="fwDefenseSceneResultMap">
- select * from ja_fw_defense_scene
+ select
+ *
+ from
+ ja_fw_defense_scene
<where>
- is_deleted = 0
+ and is_deleted = 0
<if test="param2.id != null and param2.id != ''">
and id = #{param2.id}
</if>
@@ -60,9 +61,6 @@
<if test="param2.areaDivideIds != null and param2.areaDivideIds != ''">
and area_divide_ids = #{param2.areaDivideIds}
</if>
- <if test="param2.deviceIds != null and param2.deviceIds != ''">
- and device_ids = #{param2.deviceIds}
- </if>
<if test="param2.areaCode != null and param2.areaCode != ''">
and area_code = #{param2.areaCode}
</if>
@@ -84,6 +82,47 @@
<if test="param2.status != null and param2.status != ''">
and status = #{param2.status}
</if>
+ <if test="param2.deptList != null and param2.deptList.size > 0">
+ and create_dept in
+ <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
+ </if>
+ </where>
+ </select>
+
+ <select id="selectFwDefenseSceneList" resultMap="fwDefenseSceneResultMap">
+ select ds.* from ja_fw_defense_scene ds
+ <where>
+ ds.is_deleted = 0
+ <if test="filterSelected != null and filterSelected == 1">
+ and (
+ not exists (
+ select 1
+ from ja_fw_defense_zone dz
+ where dz.is_deleted = 0
+ and dz.defense_scene_ids is not null
+ and dz.defense_scene_ids != ''
+ and find_in_set(ds.id, dz.defense_scene_ids)
+ )
+ <if test="zoneId != null">
+ or exists (
+ select 1
+ from ja_fw_defense_zone dz
+ where dz.is_deleted = 0
+ and dz.id = #{zoneId}
+ and dz.defense_scene_ids is not null
+ and dz.defense_scene_ids != ''
+ and find_in_set(ds.id, dz.defense_scene_ids)
+ )
+ </if>
+ )
+ </if>
+ <if test="areaId != null and (filterSelected == null or filterSelected != 1)">
+ and ds.area_divide_ids is not null
+ and ds.area_divide_ids != ''
+ and find_in_set(#{areaId}, replace(ds.area_divide_ids, ' ', ''))
+ </if>
</where>
</select>
--
Gitblit v1.9.3