From 4e48664942bbefe70699ca43d25cbbd56ecc8daa Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Mon, 19 Jan 2026 15:17:12 +0800
Subject: [PATCH] update-维修计划状态更新、新增定时器修改状态
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml | 564 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 561 insertions(+), 3 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 7b280a4..5fff6b6 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
@@ -3,17 +3,575 @@
<mapper namespace="org.sxkj.fw.area.mapper.FwAreaDivideMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="fwAreaDivideResultMap" type="org.sxkj.fw.area.entity.FwAreaDivideEntity">
+ <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"/>
+ <result column="is_deleted" property="isDeleted"/>
+ </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"/>
+ <result column="alarm_count" property="alarmCount"/>
+ <result column="counter_count" property="counterCount"/>
+ <result column="counter_success_count" property="counterSuccessCount"/>
+ <result column="control_effect" property="controlEffect"/>
</resultMap>
<select id="selectFwAreaDividePage" resultMap="fwAreaDivideResultMap">
- select * from ja_fw_area_divide where is_deleted = 0
+ 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
+ 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
+ <if test="param2.id != null and param2.id != ''">
+ and ad.id = #{param2.id}
+ </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}
+ </if>
+ <if test="param2.responseMechanism != null and param2.responseMechanism != ''">
+ and ad.response_mechanism = #{param2.responseMechanism}
+ </if>
+ <if test="param2.controlLevel != null and param2.controlLevel != ''">
+ and ad.control_level = #{param2.controlLevel}
+ </if>
+ <if test="param2.policeStationId != null and param2.policeStationId != ''">
+ and ad.police_station_id = #{param2.policeStationId}
+ </if>
+ <if test="param2.deviceIds != null and param2.deviceIds != ''">
+ and ad.device_ids = #{param2.deviceIds}
+ </if>
+ <if test="param2.flyDateStart != null and param2.flyDateStart != ''">
+ and ad.fly_date_start >= #{param2.flyDateStart}
+ </if>
+ <if test="param2.flyDateEnd != null and param2.flyDateEnd != ''">
+ and ad.fly_date_end <= #{param2.flyDateEnd}
+ </if>
+ <if test="param2.areaCode != null and param2.areaCode != ''">
+ and ad.area_code = #{param2.areaCode}
+ </if>
+ </where>
+ </select>
+
+ <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
+ 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
+ <if test="filterSelected != null and filterSelected == 1">
+ and (
+ not exists (
+ select 1
+ from ja_fw_defense_scene ds
+ where ds.is_deleted = 0
+ and ds.area_divide_ids is not null
+ and ds.area_divide_ids != ''
+ and find_in_set(ad.id, replace(ds.area_divide_ids, ' ', ''))
+ )
+ <if test="sceneId != null">
+ or exists (
+ select 1
+ from ja_fw_defense_scene ds
+ where ds.is_deleted = 0
+ and ds.id = #{sceneId}
+ and ds.area_divide_ids is not null
+ and ds.area_divide_ids != ''
+ and find_in_set(ad.id, replace(ds.area_divide_ids, ' ', ''))
+ )
+ </if>
+ )
+ </if>
+ <if test="sceneId != null and (filterSelected == null or filterSelected != 1)">
+ and exists (
+ select 1
+ from ja_fw_defense_scene ds
+ where ds.is_deleted = 0
+ and ds.id = #{sceneId}
+ and ds.area_divide_ids is not null
+ and ds.area_divide_ids != ''
+ and find_in_set(ad.id, replace(ds.area_divide_ids, ' ', ''))
+ )
+ </if>
+ </where>
+ </select>
+
+ <select id="selectFwAreaDivideListByDeviceIds" resultMap="fwAreaDivideResultMap">
+ select
+ ad.id,
+ ad.area_name,
+ ad.device_ids
+ from ja_fw_area_divide ad
+ <where>
+ ad.is_deleted = 0
+ and ad.device_ids is not null
+ and ad.device_ids != ''
+ <if test="deviceIds != null and deviceIds.size > 0">
+ and (
+ <foreach collection="deviceIds" item="deviceId" separator=" or ">
+ find_in_set(#{deviceId}, replace(ad.device_ids, ' ', ''))
+ </foreach>
+ )
+ </if>
+ </where>
+ </select>
+
+ <select id="selectFwDefenseSceneListByAreaIds" resultType="org.sxkj.fw.area.vo.FwDefenseSceneVO">
+ select
+ ds.id,
+ ds.scene_name as sceneName,
+ ds.area_divide_ids as areaDivideIds
+ from ja_fw_defense_scene ds
+ <where>
+ ds.is_deleted = 0
+ and ds.area_divide_ids is not null
+ and ds.area_divide_ids != ''
+ <if test="areaIds != null and areaIds.size > 0">
+ and (
+ <foreach collection="areaIds" item="areaId" separator=" or ">
+ find_in_set(#{areaId}, replace(ds.area_divide_ids, ' ', ''))
+ </foreach>
+ )
+ </if>
+ </where>
+ </select>
+
+ <select id="selectFwAreaDivideDetail" 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,
+ 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_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
+ and ad.id = #{id}
+ </select>
+
+ <select id="selectFwAreaDivideStatisticsPage" resultMap="fwAreaDivideStatisticsResultMap">
+ select
+ stats.id,
+ stats.area_name,
+ stats.area_type,
+ stats.scene_name,
+ stats.scene_type,
+ stats.device_count,
+ stats.alarm_count,
+ stats.counter_count,
+ stats.counter_success_count,
+ case
+ when stats.counter_count = 0 then '/'
+ when stats.counter_success_count * 100.0 / stats.counter_count >= 80 then '好'
+ when stats.counter_success_count * 100.0 / stats.counter_count >= 60 then '一般'
+ 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
+ where ds.is_deleted = 0
+ and find_in_set(ad.id, ds.area_divide_ids)
+ ) as scene_name,
+ (
+ select group_concat(distinct ds.scene_type)
+ from ja_fw_defense_scene ds
+ where ds.is_deleted = 0
+ and find_in_set(ad.id, ds.area_divide_ids)
+ ) as scene_type,
+ case
+ when ad.device_ids is null or trim(ad.device_ids) = '' then 0
+ else length(replace(ad.device_ids, ' ', '')) - length(replace(replace(ad.device_ids, ' ', ''), ',', '')) + 1
+ end as device_count,
+ case
+ when ad.device_ids is null or trim(ad.device_ids) = '' then 0
+ else (
+ select count(1)
+ from ja_fw_drone_alarm_record ar
+ join ja_fw_device d on d.id = ar.device_id and d.is_deleted = 0
+ where ar.is_deleted = 0
+ and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
+ )
+ end as alarm_count,
+ case
+ when ad.device_ids is null or trim(ad.device_ids) = '' then 0
+ else (
+ select count(1)
+ from ja_fw_effect_eval ee
+ join ja_fw_device d on d.id = ee.device_id and d.is_deleted = 0
+ where ee.is_deleted = 0
+ and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
+ )
+ end as counter_count,
+ case
+ when ad.device_ids is null or trim(ad.device_ids) = '' then 0
+ else (
+ select count(1)
+ from ja_fw_effect_eval ee
+ join ja_fw_device d on d.id = ee.device_id and d.is_deleted = 0
+ where ee.is_deleted = 0
+ and ee.counter_effect = 'success'
+ and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
+ )
+ end as counter_success_count
+ from ja_fw_area_divide ad
+ <where>
+ ad.is_deleted = 0
+ <if test="param2.id != null and param2.id != ''">
+ and ad.id = #{param2.id}
+ </if>
+ <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
+ from ja_fw_defense_scene ds
+ where ds.is_deleted = 0
+ and find_in_set(ad.id, ds.area_divide_ids)
+ and ds.scene_type = #{param2.sceneType}
+ )
+ </if>
+ <if test="param2.areaCode != null and param2.areaCode != ''">
+ and ad.area_code = #{param2.areaCode}
+ </if>
+ </where>
+ ) stats
+ </select>
+
+ <select id="selectFwAreaDivideStatisticsDetail" resultMap="fwAreaDivideStatisticsResultMap">
+ select
+ stats.id,
+ stats.area_name,
+ stats.area_type,
+ stats.scene_name,
+ stats.scene_type,
+ stats.device_count,
+ stats.alarm_count,
+ stats.counter_count,
+ stats.counter_success_count,
+ case
+ when stats.counter_count = 0 then '/'
+ when stats.counter_success_count * 100.0 / stats.counter_count >= 80 then '好'
+ when stats.counter_success_count * 100.0 / stats.counter_count >= 60 then '一般'
+ 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
+ where ds.is_deleted = 0
+ and find_in_set(ad.id, ds.area_divide_ids)
+ ) as scene_name,
+ (
+ select group_concat(distinct ds.scene_type)
+ from ja_fw_defense_scene ds
+ where ds.is_deleted = 0
+ and find_in_set(ad.id, ds.area_divide_ids)
+ ) as scene_type,
+ case
+ when ad.device_ids is null or trim(ad.device_ids) = '' then 0
+ else length(replace(ad.device_ids, ' ', '')) - length(replace(replace(ad.device_ids, ' ', ''), ',', '')) + 1
+ end as device_count,
+ case
+ when ad.device_ids is null or trim(ad.device_ids) = '' then 0
+ else (
+ select count(1)
+ from ja_fw_drone_alarm_record ar
+ join ja_fw_device d on d.id = ar.device_id and d.is_deleted = 0
+ where ar.is_deleted = 0
+ and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
+ )
+ end as alarm_count,
+ case
+ when ad.device_ids is null or trim(ad.device_ids) = '' then 0
+ else (
+ select count(1)
+ from ja_fw_effect_eval ee
+ join ja_fw_device d on d.id = ee.device_id and d.is_deleted = 0
+ where ee.is_deleted = 0
+ and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
+ )
+ end as counter_count,
+ case
+ when ad.device_ids is null or trim(ad.device_ids) = '' then 0
+ else (
+ select count(1)
+ from ja_fw_effect_eval ee
+ join ja_fw_device d on d.id = ee.device_id and d.is_deleted = 0
+ where ee.is_deleted = 0
+ and ee.counter_effect = 'success'
+ and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
+ )
+ end as counter_success_count
+ from ja_fw_area_divide ad
+ <where>
+ ad.is_deleted = 0
+ <if test="id != null and id != ''">
+ and ad.id = #{id}
+ </if>
+ <if test="areaCode != null and areaCode != ''">
+ and ad.area_code = #{areaCode}
+ </if>
+ </where>
+ ) stats
</select>
<select id="exportFwAreaDivide" resultType="org.sxkj.fw.area.excel.FwAreaDivideExcel">
- SELECT * FROM ja_fw_area_divide ${ew.customSqlSegment}
+ 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,
+ police_station_id,
+ device_ids,
+ fly_date_start,
+ fly_date_end,
+ area_code,
+ create_user,
+ create_dept,
+ create_time,
+ update_user,
+ update_time,
+ status,
+ is_deleted
+ FROM ja_fw_area_divide ${ew.customSqlSegment}
</select>
+ <insert id="insertWithGeom" parameterType="org.sxkj.fw.area.entity.FwAreaDivideEntity" useGeneratedKeys="true" keyProperty="id">
+ insert into ja_fw_area_divide (
+ id,
+ area_name,
+ longitude,
+ latitude,
+ area_size,
+ geom,
+ area_type,
+ trigger_condition,
+ response_mechanism,
+ control_level,
+ police_station_id,
+ device_ids,
+ fly_date_start,
+ fly_date_end,
+ area_code,
+ create_user,
+ create_dept,
+ create_time,
+ update_user,
+ update_time,
+ status,
+ is_deleted
+ ) 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},
+ #{policeStationId},
+ #{deviceIds},
+ #{flyDateStart},
+ #{flyDateEnd},
+ #{areaCode},
+ #{createUser},
+ #{createDept},
+ #{createTime},
+ #{updateUser},
+ #{updateTime},
+ IFNULL(#{status}, '0'),
+ IFNULL(#{isDeleted}, 0)
+ )
+ </insert>
+
+ <update id="updateWithGeomById" parameterType="org.sxkj.fw.area.entity.FwAreaDivideEntity">
+ 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>
+ <if test="policeStationId != null">police_station_id = #{policeStationId},</if>
+ <if test="deviceIds != null">device_ids = #{deviceIds},</if>
+ <if test="flyDateStart != null">fly_date_start = #{flyDateStart},</if>
+ <if test="flyDateEnd != null">fly_date_end = #{flyDateEnd},</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