From 3dcef55348087d16bb6d2c5f604f3cfa52425fb8 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 15:05:07 +0800
Subject: [PATCH] opt: sql改造其他模块改造9

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml |   31 ++++++++++++++++++-------------
 1 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
index 86bb63e..e59b1c8 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
@@ -763,15 +763,16 @@
 
     <select id="getDeviceStatistics" resultType="org.sxkj.fw.cockpit.vo.DeviceStatisticsVO">
         SELECT
-            d.final_outbound_area AS type,
-            COUNT(*) AS count
+        d.final_outbound_area AS type,
+        COUNT(*) AS count
         FROM
-            ja_fw_device d
+        ja_fw_device d
         LEFT JOIN ja_fw_area_divide ad
+        /* 修改点1：d.id 是数字，匹配文本数组需转 VARCHAR */
         on d.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
         AND ad.is_deleted = 0
         WHERE
-            d.is_deleted = 0
+        d.is_deleted = 0
         AND d.is_enabled = 1
         AND d.final_outbound_area IS NOT NULL
         <if test="regionCode != null and regionCode != ''">
@@ -780,7 +781,9 @@
                 or d.id IN (
                 SELECT device_id::bigint
                 FROM ja_fw_device_per_share
-                WHERE loan_to_dept_id = #{currentDeptId}
+                WHERE
+                /* 修改点2：强制显式转换参数，防止 bigint = character varying */
+                loan_to_dept_id = #{currentDeptId}::bigint
                 AND is_deleted = 0
                 )
             </if>
@@ -789,14 +792,16 @@
         <if test="flyTime != null">
             and exists (
             select 1
-            from ja_fw_defense_scene ds
-            join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0
-            where ds.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[])
-            and (dsm.effective_date_start is null or dsm.effective_date_start &lt;= #{flyTime}::timestamp)
-            and (dsm.effective_date_end is null or dsm.effective_date_end &gt;= #{flyTime}::timestamp)
+            from ja_fw_defense_scene ds_sub
+            join ja_fw_defense_scene_manage dsm_sub on dsm_sub.defense_scene_id::VARCHAR = ds_sub.id::VARCHAR and dsm_sub.is_deleted = 0
+            where ds_sub.is_deleted = 0
+            and ds_sub.area_divide_ids is not null
+            and ds_sub.area_divide_ids != ''
+            /* 修改点3：ad.id 转 VARCHAR 匹配，去掉不稳定的 ::bigint[] */
+            and ad.id::VARCHAR = ANY(string_to_array(replace(ds_sub.area_divide_ids, ' ', ''), ','))
+            /* 修改点4：日期比对确保类型对等 */
+            and (dsm_sub.effective_date_start is null or dsm_sub.effective_date_start &lt;= #{flyTime})
+            and (dsm_sub.effective_date_end is null or dsm_sub.effective_date_end &gt;= #{flyTime})
             )
         </if>
         GROUP BY

--
Gitblit v1.9.3