From ecc14b8398e4b7072a3e4b6096e084fadd4a51d8 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 11:29:51 +0800
Subject: [PATCH] opt: sql改造其他模块改造3
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml | 12 +++++-------
1 files changed, 5 insertions(+), 7 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 53471e1..22b85a9 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
@@ -40,7 +40,7 @@
ts.device_id,
ts.area_divide_id,
ts.defense_scene_id,
- ds.scene_name as defense_scene_name,
+ dsm.scene_name as defense_scene_name,
ts.longitude,
ts.latitude,
ts.dispatch_user,
@@ -60,23 +60,21 @@
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
+ ja_fw_device d on d.id = ts.device_id::VARCHAR
left join
- ja_fw_area_divide ad on ad.id = ts.area_divide_id
+ ja_fw_area_divide ad on ad.id = ts.area_divide_id::VARCHAR
left join
- ja_fw_defense_scene ds on ds.id = ts.defense_scene_id
+ ja_fw_defense_scene_manage dsm on dsm.id = 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 = ANY(string_to_array(replace(dz.defense_scene_ids, ' ', ''), ',')::bigint[])
<where>
ts.is_deleted = 0
<if test="param2.deviceName != null and param2.deviceName != ''">
--
Gitblit v1.9.3