From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 14:09:29 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml | 136 ++++++++++++++++-----------------------------
1 files changed, 48 insertions(+), 88 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
index 97795e8..d9cce1c 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
@@ -8,6 +8,7 @@
<result column="device_id" property="deviceId"/>
<result column="area_divide_id" property="areaDivideId"/>
<result column="defense_scene_id" property="defenseSceneId"/>
+ <result column="defense_scene_name" property="defenseSceneName"/>
<result column="longitude" property="longitude"/>
<result column="latitude" property="latitude"/>
<result column="dispatch_user" property="dispatchUser"/>
@@ -35,96 +36,49 @@
<select id="selectFwTaskSchedulePage" resultMap="fwTaskScheduleResultMap">
select
- ts.id,
- ts.device_id,
- ts.area_divide_id,
- ts.defense_scene_id,
- ts.longitude,
- ts.latitude,
- ts.dispatch_user,
- ts.dispatch_start_time,
- ts.dispatch_end_time,
- ts.dispatch_content,
- ts.dispatch_result,
- ts.dispose_measure,
- ts.area_code,
- ts.create_user,
- ts.create_dept,
- ts.create_time,
- ts.update_user,
- ts.update_time,
- ts.is_deleted,
- d.device_sn,
- d.device_name,
- d.device_type,
- d.status as device_status,
- ad.longitude as device_longitude,
- ad.latitude as device_latitude,
- ad.area_name,
- dz.zone_name as defense_zone_name
- from ja_fw_task_schedule ts
- left join ja_fw_device d on d.id = ts.device_id and d.is_deleted = 0
- left join ja_fw_area_divide ad on ad.id = ts.area_divide_id and ad.is_deleted = 0
- left join ja_fw_defense_scene ds on ds.id = ts.defense_scene_id and ds.is_deleted = 0
- left join ja_fw_defense_zone dz on dz.is_deleted = 0
+ ts.id,
+ ts.device_id,
+ ts.area_divide_id,
+ ts.defense_scene_id,
+ dsm.scene_name as defense_scene_name,
+ ts.longitude,
+ ts.latitude,
+ ts.dispatch_user,
+ ts.dispatch_start_time,
+ ts.dispatch_end_time,
+ ts.dispatch_content,
+ ts.dispatch_result,
+ ts.dispose_measure,
+ ts.area_code,
+ ts.create_user,
+ ts.create_dept,
+ ts.create_time,
+ ts.update_user,
+ ts.update_time,
+ ts.is_deleted,
+ d.device_sn,
+ d.device_name,
+ d.device_type,
+ d.status as device_status,
+ ad.area_name,
+ dz.zone_name as defense_zone_name
+ from
+ ja_fw_task_schedule ts
+ left join
+ ja_fw_device d on d.id::VARCHAR = ts.device_id::VARCHAR
+ left join
+ ja_fw_area_divide ad on ad.id::VARCHAR = ts.area_divide_id::VARCHAR
+ left join
+ ja_fw_defense_scene_manage dsm on dsm.id::VARCHAR = ts.defense_scene_id::VARCHAR
+ left join
+ ja_fw_defense_zone dz on dz.is_deleted = 0
and dz.defense_scene_ids is not null
and dz.defense_scene_ids != ''
- and find_in_set(ds.id, replace(dz.defense_scene_ids, ' ', ''))
+ and dsm.id::VARCHAR = ANY(string_to_array(replace(dz.defense_scene_ids, ' ', ''), ','))
<where>
ts.is_deleted = 0
- <if test="param2.id != null and param2.id != ''">
- and ts.id = #{param2.id}
- </if>
<if test="param2.deviceId != null and param2.deviceId != ''">
and ts.device_id = #{param2.deviceId}
- </if>
- <if test="param2.areaDivideId != null and param2.areaDivideId != ''">
- and ts.area_divide_id = #{param2.areaDivideId}
- </if>
- <if test="param2.defenseSceneId != null and param2.defenseSceneId != ''">
- and ts.defense_scene_id = #{param2.defenseSceneId}
- </if>
- <if test="param2.longitude != null and param2.longitude != ''">
- and ts.longitude = #{param2.longitude}
- </if>
- <if test="param2.latitude != null and param2.latitude != ''">
- and ts.latitude = #{param2.latitude}
- </if>
- <if test="param2.dispatchUser != null and param2.dispatchUser != ''">
- and ts.dispatch_user = #{param2.dispatchUser}
- </if>
- <if test="param2.dispatchStartTime != null and param2.dispatchStartTime != ''">
- and ts.dispatch_start_time = #{param2.dispatchStartTime}
- </if>
- <if test="param2.dispatchEndTime != null and param2.dispatchEndTime != ''">
- and ts.dispatch_end_time = #{param2.dispatchEndTime}
- </if>
- <if test="param2.dispatchContent != null and param2.dispatchContent != ''">
- and ts.dispatch_content = #{param2.dispatchContent}
- </if>
- <if test="param2.dispatchResult != null and param2.dispatchResult != ''">
- and ts.dispatch_result = #{param2.dispatchResult}
- </if>
- <if test="param2.disposeMeasure != null and param2.disposeMeasure != ''">
- and ts.dispose_measure = #{param2.disposeMeasure}
- </if>
- <if test="param2.areaCode != null and param2.areaCode != ''">
- and ts.area_code = #{param2.areaCode}
- </if>
- <if test="param2.createUser != null and param2.createUser != ''">
- and ts.create_user = #{param2.createUser}
- </if>
- <if test="param2.createDept != null and param2.createDept != ''">
- and ts.create_dept = #{param2.createDept}
- </if>
- <if test="param2.createTime != null and param2.createTime != ''">
- and ts.create_time = #{param2.createTime}
- </if>
- <if test="param2.updateUser != null and param2.updateUser != ''">
- and ts.update_user = #{param2.updateUser}
- </if>
- <if test="param2.updateTime != null and param2.updateTime != ''">
- and ts.update_time = #{param2.updateTime}
</if>
<if test="param2.deviceName != null and param2.deviceName != ''">
and d.device_name like concat('%', #{param2.deviceName}, '%')
@@ -132,11 +86,17 @@
<if test="param2.deviceSn != null and param2.deviceSn != ''">
and d.device_sn like concat('%', #{param2.deviceSn}, '%')
</if>
- <if test="param2.status != null and param2.status != ''">
- and d.status = #{param2.status}
+ <if test="param2.deviceType != null and param2.deviceType != ''">
+ and d.device_type = #{param2.deviceType}
</if>
- <if test="param2.isDeleted != null and param2.isDeleted != ''">
- and ts.is_deleted = #{param2.isDeleted}
+ <if test="param2.status != null and param2.status != ''">
+ and d.status::text = #{param2.status}::text
+ </if>
+ <if test="param2.deptList != null and param2.deptList.size > 0">
+ and ts.create_dept in
+ <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
</if>
</where>
</select>
--
Gitblit v1.9.3