From 592a015f2ed43168822ed4729b0316dafcce4a38 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Thu, 29 Jan 2026 14:11:04 +0800
Subject: [PATCH] update-区域划分表结构调整
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml | 71 +++--------------------------------
1 files changed, 6 insertions(+), 65 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 576ca5e..36b05ca 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,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">
@@ -40,24 +31,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
@@ -105,24 +79,7 @@
<select id="selectFwAreaDivideList" 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 ja_fw_police_station ps on ps.id = ad.police_station_id and ps.is_deleted = 0
<where>
@@ -217,26 +174,10 @@
<select id="selectFwAreaDivideDetail" 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,
- ps.contact_person as police_station_contact_person,
- ps.contact_phone as police_station_contact_phone,
- ad.create_user,
- ad.create_dept,
- ad.create_time,
- ad.update_user,
- ad.update_time,
- ad.status,
- ad.is_deleted
+ ad.*,
+ ps.station_name as police_station_name,
+ ps.contact_person as police_station_contact_person,
+ ps.contact_phone as police_station_contact_phone
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 ad.is_deleted = 0
--
Gitblit v1.9.3