From e5cc27b36eba4d8483fd3fabf5052e8f63629002 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 29 Jan 2026 13:05:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml | 61 +-----------------------------
1 files changed, 2 insertions(+), 59 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 3f21b1c..1b36ebc 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
@@ -6,11 +6,6 @@
<resultMap id="fwAreaDivideResultMap" type="org.sxkj.fw.area.vo.FwAreaDivideVO">
<result column="id" property="id"/>
<result column="area_name" property="areaName"/>
- <result column="longitude" property="longitude"/>
- <result column="latitude" property="latitude"/>
- <result column="area_size" property="areaSize"/>
- <result column="geom" property="geom"/>
- <result column="area_type" property="areaType"/>
<result column="trigger_condition" property="triggerCondition"/>
<result column="response_mechanism" property="responseMechanism"/>
<result column="control_level" property="controlLevel"/>
@@ -19,15 +14,6 @@
<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">
@@ -46,24 +32,7 @@
<select id="selectFwAreaDividePage" resultMap="fwAreaDivideResultMap">
select
- 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
+ ad.*
from
ja_fw_area_divide ad
left join
@@ -123,33 +92,7 @@
<select id="selectFwAreaDivideList" resultMap="fwAreaDivideResultMap">
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,
- 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
+ ad.*
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>
--
Gitblit v1.9.3