From 291512d150c44fbb2b993903237d27ae6c4277e7 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Fri, 30 Jan 2026 15:10:46 +0800
Subject: [PATCH] 区域场景优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 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..3e5e20b 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,42 @@
<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>
+ </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>
--
Gitblit v1.9.3