From 953dd58984ed62fe71373cfcb48c0fb18cb5df05 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 13:58:33 +0800
Subject: [PATCH] 区域划分优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml | 127 +++++++++++++++++-------------------------
1 files changed, 51 insertions(+), 76 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
index 1b36ebc..576ca5e 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
@@ -14,12 +14,20 @@
<result column="fly_date_start" property="flyDateStart"/>
<result column="fly_date_end" property="flyDateEnd"/>
<result column="area_code" property="areaCode"/>
+ <result column="police_station_name" property="policeStationName"/>
+ <result column="police_station_contact_person" property="policeStationContactPerson"/>
+ <result column="police_station_contact_phone" property="policeStationContactPhone"/>
+ <result column="create_user" property="createUser"/>
+ <result column="create_dept" property="createDept"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_user" property="updateUser"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="status" property="status"/>
</resultMap>
<resultMap id="fwAreaDivideStatisticsResultMap" type="org.sxkj.fw.area.vo.FwAreaDivideStatisticsVO">
<result column="id" property="id"/>
<result column="area_name" property="areaName"/>
- <result column="area_type" property="areaType"/>
<result column="scene_name" property="sceneName"/>
<result column="scene_type" property="sceneType"/>
<result column="device_count" property="deviceCount"/>
@@ -32,7 +40,24 @@
<select id="selectFwAreaDividePage" resultMap="fwAreaDivideResultMap">
select
- ad.*
+ ad.id,
+ ad.area_name,
+ ad.trigger_condition,
+ ad.response_mechanism,
+ ad.control_level,
+ ad.police_station_id,
+ ad.device_ids,
+ ad.fly_date_start,
+ ad.fly_date_end,
+ ad.area_code,
+ ps.station_name as police_station_name,
+ ad.create_user,
+ ad.create_dept,
+ ad.create_time,
+ ad.update_user,
+ ad.update_time,
+ ad.status,
+ ad.is_deleted
from
ja_fw_area_divide ad
left join
@@ -44,18 +69,6 @@
</if>
<if test="param2.areaName != null and param2.areaName != ''">
and ad.area_name like concat('%', #{param2.areaName}, '%')
- </if>
- <if test="param2.longitude != null and param2.longitude != ''">
- and ad.longitude = #{param2.longitude}
- </if>
- <if test="param2.latitude != null and param2.latitude != ''">
- and ad.latitude = #{param2.latitude}
- </if>
- <if test="param2.areaSize != null and param2.areaSize != ''">
- and ad.area_size = #{param2.areaSize}
- </if>
- <if test="param2.areaType != null and param2.areaType != ''">
- and ad.area_type = #{param2.areaType}
</if>
<if test="param2.triggerCondition != null and param2.triggerCondition != ''">
and ad.trigger_condition = #{param2.triggerCondition}
@@ -92,7 +105,24 @@
<select id="selectFwAreaDivideList" resultMap="fwAreaDivideResultMap">
select
- ad.*
+ ad.id,
+ ad.area_name,
+ ad.trigger_condition,
+ ad.response_mechanism,
+ ad.control_level,
+ ad.police_station_id,
+ ad.device_ids,
+ ad.fly_date_start,
+ ad.fly_date_end,
+ ad.area_code,
+ ps.station_name as police_station_name,
+ ad.create_user,
+ ad.create_dept,
+ ad.create_time,
+ ad.update_user,
+ ad.update_time,
+ ad.status,
+ ad.is_deleted
from ja_fw_area_divide ad
left join ja_fw_police_station ps on ps.id = ad.police_station_id and ps.is_deleted = 0
<where>
@@ -189,15 +219,6 @@
select
ad.id,
ad.area_name,
- ad.longitude,
- ad.latitude,
- ad.area_size,
- case
- when ad.geom is null then null
- when ST_SRID(ad.geom) is null or ST_SRID(ad.geom) = 0 then ST_AsText(ad.geom)
- else concat(ST_AsText(ST_SwapXY(ad.geom)), ' | ', ST_SRID(ad.geom))
- end as geom,
- ad.area_type,
ad.trigger_condition,
ad.response_mechanism,
ad.control_level,
@@ -226,7 +247,6 @@
select
stats.id,
stats.area_name,
- stats.area_type,
stats.scene_name,
stats.scene_type,
stats.device_count,
@@ -243,7 +263,6 @@
select
ad.id,
ad.area_name,
- ad.area_type,
(
select group_concat(distinct ds.scene_name)
from ja_fw_defense_scene ds
@@ -300,9 +319,6 @@
<if test="param2.areaName != null and param2.areaName != ''">
and ad.area_name like concat('%', #{param2.areaName}, '%')
</if>
- <if test="param2.areaType != null and param2.areaType != ''">
- and ad.area_type = #{param2.areaType}
- </if>
<if test="param2.sceneType != null and param2.sceneType != ''">
and exists (
select 1
@@ -329,7 +345,6 @@
select
stats.id,
stats.area_name,
- stats.area_type,
stats.scene_name,
stats.scene_type,
stats.device_count,
@@ -343,13 +358,12 @@
else '差'
end as control_effect
from (
- select
- ad.id,
- ad.area_name,
- ad.area_type,
- (
- select group_concat(distinct ds.scene_name)
- from ja_fw_defense_scene ds
+ select
+ ad.id,
+ ad.area_name,
+ (
+ select group_concat(distinct ds.scene_name)
+ from ja_fw_defense_scene ds
where ds.is_deleted = 0
and find_in_set(ad.id, ds.area_divide_ids)
) as scene_name,
@@ -412,11 +426,6 @@
SELECT
id,
area_name,
- longitude,
- latitude,
- area_size,
- concat(ST_AsText(geom), ' | ', ST_SRID(geom)) as geom,
- area_type,
trigger_condition,
response_mechanism,
control_level,
@@ -439,11 +448,6 @@
insert into ja_fw_area_divide (
id,
area_name,
- longitude,
- latitude,
- area_size,
- geom,
- area_type,
trigger_condition,
response_mechanism,
control_level,
@@ -462,22 +466,6 @@
) values (
#{id},
#{areaName},
- #{longitude},
- #{latitude},
- #{areaSize},
- <choose>
- <when test="geom != null and geom != ''">
- case
- when instr(#{geom}, '|') > 0 then ST_GeomFromText(
- trim(substring_index(#{geom}, '|', 1)),
- cast(trim(substring_index(#{geom}, '|', -1)) as unsigned)
- )
- else ST_GeomFromText(trim(#{geom}))
- end
- </when>
- <otherwise>null</otherwise>
- </choose>,
- #{areaType},
#{triggerCondition},
#{responseMechanism},
#{controlLevel},
@@ -500,19 +488,6 @@
update ja_fw_area_divide
<set>
<if test="areaName != null">area_name = #{areaName},</if>
- <if test="longitude != null">longitude = #{longitude},</if>
- <if test="latitude != null">latitude = #{latitude},</if>
- <if test="areaSize != null">area_size = #{areaSize},</if>
- <if test="geom != null and geom != ''">
- geom = case
- when instr(#{geom}, '|') > 0 then ST_GeomFromText(
- trim(substring_index(#{geom}, '|', 1)),
- cast(trim(substring_index(#{geom}, '|', -1)) as unsigned)
- )
- else ST_GeomFromText(trim(#{geom}))
- end,
- </if>
- <if test="areaType != null">area_type = #{areaType},</if>
<if test="triggerCondition != null">trigger_condition = #{triggerCondition},</if>
<if test="responseMechanism != null">response_mechanism = #{responseMechanism},</if>
<if test="controlLevel != null">control_level = #{controlLevel},</if>
--
Gitblit v1.9.3