From 8585b431e9257333413358eb37c30ae58f74db76 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 13 Aug 2026 15:46:10 +0800
Subject: [PATCH] refactor(database): 优化数据库查询中的字段映射
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml | 290 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 287 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml
index 480af0f..9612c28 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml
@@ -3,17 +3,301 @@
<mapper namespace="org.sxkj.fw.area.mapper.FwDefenseZoneMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="fwDefenseZoneResultMap" type="org.sxkj.fw.area.entity.FwDefenseZoneEntity">
+ <resultMap id="fwDefenseZoneResultMap" type="org.sxkj.fw.area.vo.FwDefenseZoneVO">
+ <result column="id" property="id"/>
+ <result column="zone_name" property="zoneName"/>
+ <result column="zone_area" property="zoneArea"/>
+ <result column="defense_scene_ids" property="defenseSceneIds"/>
+ <result column="area_divide_ids" property="areaDivideIds"/>
+ <result column="device_ids" property="deviceIds"/>
+ <result column="geom" property="geom"/>
+ <result column="area_code" property="areaCode"/>
+ <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="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"/>
+ <result column="police_station_id" property="policeStationId"/>
+ <result column="device_ids" property="deviceIds"/>
+ <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>
+
+ <select id="selectDefenseZoneExists" resultType="java.lang.Integer">
+ select count(1)
+ from ja_fw_defense_zone
+ where is_deleted = 0
+ and id = #{zoneId}
+ </select>
+
+ <select id="selectFwAreaDivideListByZoneId" resultMap="fwAreaDivideResultMap">
+ select distinct
+ 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 public.st_astext(ad.geom)
+ else concat(public.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,
+ 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
+ from ja_fw_defense_zone dz
+ join ja_fw_defense_scene ds on ds.is_deleted = 0
+ and dz.is_deleted = 0
+ and dz.id = #{zoneId}
+ and dz.defense_scene_ids is not null
+ and dz.defense_scene_ids != ''
+ and ds.id = ANY(string_to_array(replace(dz.defense_scene_ids, ' ', ''), ',')::bigint[])
+ join ja_fw_area_divide ad on ad.is_deleted = 0
+ and ds.area_divide_ids is not null
+ and ds.area_divide_ids != ''
+ and ad.id = ANY(string_to_array(replace(ds.area_divide_ids, ' ', ''), ',')::bigint[])
+ left join ja_fw_police_station ps on ps.id::VARCHAR = ad.police_station_id::VARCHAR and ps.is_deleted = 0
+ </select>
<select id="selectFwDefenseZonePage" resultMap="fwDefenseZoneResultMap">
- select * from ja_fw_defense_zone where is_deleted = 0
+ select
+ id,
+ zone_name,
+ zone_area,
+ defense_scene_ids,
+ area_divide_ids,
+ device_ids,
+ case
+ when geom is null then null
+ when ST_SRID(geom) is null or ST_SRID(geom) = 0 then public.st_astext(geom)
+ else concat(public.st_astext(ST_SwapXY(geom)), ' | ', ST_SRID(geom))
+ end as geom,
+ area_code,
+ create_user,
+ create_dept,
+ create_time,
+ update_user,
+ update_time,
+ status,
+ is_deleted
+ from ja_fw_defense_zone
+ <where>
+ is_deleted = 0
+ <if test="param2.id != null and param2.id != ''">
+ and id = #{param2.id}
+ </if>
+ <if test="param2.zoneName != null and param2.zoneName != ''">
+ and zone_name like concat('%', #{param2.zoneName}, '%')
+ </if>
+ <if test="param2.zoneArea != null and param2.zoneArea != ''">
+ and zone_area = #{param2.zoneArea}
+ </if>
+ <if test="param2.defenseSceneIds != null and param2.defenseSceneIds != ''">
+ and defense_scene_ids = #{param2.defenseSceneIds}
+ </if>
+ <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.geom != null and param2.geom != ''">
+ and ST_Equals(
+ geom,
+ ST_SRID(
+ ST_GeomFromText(
+ trim(case when instr(#{param2.geom}, '|') > 0 then substring_index(#{param2.geom}, '|', 1) else #{param2.geom} end)
+ ),
+ case when instr(#{param2.geom}, '|') > 0 then cast(trim(substring_index(#{param2.geom}, '|', -1)) as unsigned) else 4326 end
+ )
+ )
+ </if>
+ <if test="param2.areaCode != null and param2.areaCode != ''">
+ and area_code = #{param2.areaCode}
+ </if>
+ <if test="param2.createUser != null and param2.createUser != ''">
+ and create_user = #{param2.createUser}
+ </if>
+ <if test="param2.createDept != null and param2.createDept != ''">
+ and create_dept = #{param2.createDept}
+ </if>
+ <if test="param2.createTime != null and param2.createTime != ''">
+ and create_time = #{param2.createTime}
+ </if>
+ <if test="param2.updateUser != null and param2.updateUser != ''">
+ and update_user = #{param2.updateUser}
+ </if>
+ <if test="param2.updateTime != null and param2.updateTime != ''">
+ and update_time = #{param2.updateTime}
+ </if>
+ <if test="param2.status != null and param2.status != ''">
+ and status = #{param2.status}
+ </if>
+ </where>
+ </select>
+
+ <select id="selectFwDefenseZoneDetail" resultMap="fwDefenseZoneResultMap">
+ select
+ id,
+ zone_name,
+ zone_area,
+ defense_scene_ids,
+ area_divide_ids,
+ device_ids,
+ case
+ when geom is null then null
+ when ST_SRID(geom) is null or ST_SRID(geom) = 0 then public.st_astext(geom)
+ else concat(public.st_astext(ST_SwapXY(geom)), ' | ', ST_SRID(geom))
+ end as geom,
+ area_code,
+ create_user,
+ create_dept,
+ create_time,
+ update_user,
+ update_time,
+ status,
+ is_deleted
+ from ja_fw_defense_zone
+ where is_deleted = 0
+ and id = #{id}
</select>
<select id="exportFwDefenseZone" resultType="org.sxkj.fw.area.excel.FwDefenseZoneExcel">
- SELECT * FROM ja_fw_defense_zone ${ew.customSqlSegment}
+ SELECT
+ id,
+ zone_name,
+ zone_area,
+ defense_scene_ids,
+ area_divide_ids,
+ device_ids,
+ concat(public.st_astext(geom), ' | ', ST_SRID(geom)) as geom,
+ area_code,
+ create_user,
+ create_dept,
+ create_time,
+ update_user,
+ update_time,
+ status,
+ is_deleted
+ FROM ja_fw_defense_zone ${ew.customSqlSegment}
</select>
+ <insert id="insertWithGeom" parameterType="org.sxkj.fw.area.entity.FwDefenseZoneEntity" useGeneratedKeys="true" keyProperty="id">
+ insert into ja_fw_defense_zone (
+ id,
+ zone_name,
+ zone_area,
+ defense_scene_ids,
+ area_divide_ids,
+ device_ids,
+ geom,
+ area_code,
+ create_user,
+ create_dept,
+ create_time,
+ update_user,
+ update_time,
+ status,
+ is_deleted
+ ) values (
+ #{id},
+ #{zoneName},
+ #{zoneArea},
+ #{defenseSceneIds},
+ #{areaDivideIds},
+ #{deviceIds},
+ <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>,
+ #{areaCode},
+ #{createUser},
+ #{createDept},
+ #{createTime},
+ #{updateUser},
+ #{updateTime},
+ COALESCE(#{status}, '0'),
+ COALESCE(#{isDeleted}, 0)
+ )
+ </insert>
+
+ <update id="updateWithGeomById" parameterType="org.sxkj.fw.area.entity.FwDefenseZoneEntity">
+ update ja_fw_defense_zone
+ <set>
+ <if test="zoneName != null">zone_name = #{zoneName},</if>
+ <if test="zoneArea != null">zone_area = #{zoneArea},</if>
+ <if test="defenseSceneIds != null">defense_scene_ids = #{defenseSceneIds},</if>
+ <if test="areaDivideIds != null">area_divide_ids = #{areaDivideIds},</if>
+ <if test="deviceIds != null">device_ids = #{deviceIds},</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="areaCode != null">area_code = #{areaCode},</if>
+ <if test="createUser != null">create_user = #{createUser},</if>
+ <if test="createDept != null">create_dept = #{createDept},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="updateUser != null">update_user = #{updateUser},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="status != null">status = #{status},</if>
+ <if test="isDeleted != null">is_deleted = #{isDeleted},</if>
+ </set>
+ where id = #{id}
+ </update>
+
</mapper>
--
Gitblit v1.9.3