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 | 94 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 92 insertions(+), 2 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 a62107c..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
@@ -3,12 +3,102 @@
<mapper namespace="org.sxkj.fw.detection.mapper.FwTaskScheduleMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="fwTaskScheduleResultMap" type="org.sxkj.fw.detection.entity.FwTaskScheduleEntity">
+ <resultMap id="fwTaskScheduleResultMap" type="org.sxkj.fw.detection.vo.FwTaskScheduleVO">
+ <result column="id" property="id"/>
+ <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"/>
+ <result column="dispatch_start_time" property="dispatchStartTime"/>
+ <result column="dispatch_end_time" property="dispatchEndTime"/>
+ <result column="dispatch_content" property="dispatchContent"/>
+ <result column="dispatch_result" property="dispatchResult"/>
+ <result column="dispose_measure" property="disposeMeasure"/>
+ <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"/>
+ <result column="device_sn" property="deviceSn"/>
+ <result column="device_name" property="deviceName"/>
+ <result column="device_type" property="deviceType"/>
+ <result column="device_longitude" property="deviceLongitude"/>
+ <result column="device_latitude" property="deviceLatitude"/>
+ <result column="area_name" property="areaName"/>
+ <result column="defense_zone_name" property="defenseZoneName"/>
</resultMap>
<select id="selectFwTaskSchedulePage" resultMap="fwTaskScheduleResultMap">
- select * from ja_fw_task_schedule where is_deleted = 0
+ select
+ 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 dsm.id::VARCHAR = ANY(string_to_array(replace(dz.defense_scene_ids, ' ', ''), ','))
+ <where>
+ ts.is_deleted = 0
+ <if test="param2.deviceId != null and param2.deviceId != ''">
+ and ts.device_id = #{param2.deviceId}
+ </if>
+ <if test="param2.deviceName != null and param2.deviceName != ''">
+ and d.device_name like concat('%', #{param2.deviceName}, '%')
+ </if>
+ <if test="param2.deviceSn != null and param2.deviceSn != ''">
+ and d.device_sn like concat('%', #{param2.deviceSn}, '%')
+ </if>
+ <if test="param2.deviceType != null and param2.deviceType != ''">
+ and d.device_type = #{param2.deviceType}
+ </if>
+ <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