From b954d7a119eb635394bf4ff3619a9ab4b4978e48 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 09:33:34 +0800
Subject: [PATCH] sql改造首页

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml |  361 +++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 287 insertions(+), 74 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 d44b2e0..72f9e7a 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
@@ -44,7 +44,7 @@
         from
             ja_fw_device
         <where>
-            is_deleted = 0
+                is_deleted = 0
             <if test="param2.id != null and param2.id != ''">
                 and id = #{param2.id}
             </if>
@@ -86,68 +86,97 @@
                 and status = #{param2.status}
             </if>
             <if test="param2.isTrack != null and param2.isTrack == 1">
-                and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) > 0
+                and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id::VARCHAR) > 0
             </if>
             <if test="param2.isTrack != null and param2.isTrack == 2">
-                and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) = 0
+                and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id::VARCHAR) = 0
             </if>
             <if test="param2.deptList != null and param2.deptList.size > 0">
-                and create_dept in
+                and ( create_dept in
                 <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
                     #{deptId}
                 </foreach>
+                <!-- 或者设备是共享给当前部门的 -->
+                <if test="param2.currentDeptId != null and param2.currentDeptId != '' ">
+                    or id in (
+                    SELECT device_id FROM ja_fw_device_per_share
+                    WHERE loan_to_dept_id = #{param2.currentDeptId}
+                    AND is_deleted = 0
+                    )
+                </if>
+                )
             </if>
         </where>
+        order by
+            create_time desc
     </select>
 
     <select id="selectFwDeviceList" resultMap="fwDeviceResultMap">
         select * from ja_fw_device
         <where>
             is_deleted = 0
-            <if test="isAreaSelect != null and isAreaSelect == 1">
-                and (
+            <choose>
+                <when test="areaIds != null and areaIds.size > 0">
+                    and (
+                        exists (
+                    select 1
+                    from ja_fw_area_divide ad
+                    where ad.is_deleted = 0
+                    and ad.id in
+                    <foreach collection="areaIds" item="areaIdItem" separator="," open="(" close=")">
+                        #{areaIdItem}
+                    </foreach>
+                    and ad.device_ids is not null
+                    and ad.device_ids != ''
+                    and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
+                        )
+                    )
+                </when>
+                <when test="isAreaSelect != null and isAreaSelect == 1">
+                    and (
                     <choose>
                         <when test="areaId != null">
                             exists (
-                                select 1
-                                from ja_fw_area_divide ad
-                                where ad.is_deleted = 0
-                                and ad.id = #{areaId}
-                                and ad.device_ids is not null
-                                and ad.device_ids != ''
-                                and find_in_set(ja_fw_device.id, ad.device_ids)
+                            select 1
+                            from ja_fw_area_divide ad
+                            where ad.is_deleted = 0
+                            and ad.id = #{areaId}
+                            and ad.device_ids is not null
+                            and ad.device_ids != ''
+                            and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
                             )
                             or not exists (
-                                select 1
-                                from ja_fw_area_divide ad
-                                where ad.is_deleted = 0
-                                and ad.device_ids is not null
-                                and ad.device_ids != ''
-                                and find_in_set(ja_fw_device.id, ad.device_ids)
-                                and ad.id != #{areaId}
+                            select 1
+                            from ja_fw_area_divide ad
+                            where ad.is_deleted = 0
+                            and ad.device_ids is not null
+                            and ad.device_ids != ''
+                            and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
+                            and ad.id != #{areaId}
                             )
                         </when>
                         <otherwise>
                             not exists (
-                                select 1
-                                from ja_fw_area_divide ad
-                                where ad.is_deleted = 0
-                                and ad.device_ids is not null
-                                and ad.device_ids != ''
-                                and find_in_set(ja_fw_device.id, ad.device_ids)
+                            select 1
+                            from ja_fw_area_divide ad
+                            where ad.is_deleted = 0
+                            and ad.device_ids is not null
+                            and ad.device_ids != ''
+                            and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
                             )
                         </otherwise>
                     </choose>
-                )
-            </if>
+                    )
+                </when>
+            </choose>
             <if test="status != null">
                 and status = #{status}
             </if>
             <if test="isTrack != null and isTrack == 1">
-                and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) > 0
+                and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id::VARCHAR) > 0
             </if>
             <if test="isTrack != null and isTrack == 2">
-                and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) = 0
+                and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id::VARCHAR) = 0
             </if>
         </where>
     </select>
@@ -168,7 +197,7 @@
                                   and ad.id = #{query.areaId}
                                   and ad.device_ids is not null
                                   and ad.device_ids != ''
-                                  and find_in_set(ja_fw_device.id, ad.device_ids)
+                                  and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
                             )
                             or not exists (
                                 select 1
@@ -176,7 +205,7 @@
                                 where ad.is_deleted = 0
                                   and ad.device_ids is not null
                                   and ad.device_ids != ''
-                                  and find_in_set(ja_fw_device.id, ad.device_ids)
+                                  and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
                                   and ad.id != #{query.areaId}
                             )
                         </when>
@@ -187,7 +216,7 @@
                                 where ad.is_deleted = 0
                                   and ad.device_ids is not null
                                   and ad.device_ids != ''
-                                  and find_in_set(ja_fw_device.id, ad.device_ids)
+                                  and ja_fw_device.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
                             )
                         </otherwise>
                     </choose>
@@ -197,10 +226,10 @@
                 and status = #{query.status}
             </if>
             <if test="query.isTrack != null and query.isTrack == 1">
-                and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) > 0
+                and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id::VARCHAR) > 0
             </if>
             <if test="query.isTrack != null and query.isTrack == 2">
-                and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id) = 0
+                and (SELECT COUNT(*) FROM ja_fw_device_track tmp WHERE ja_fw_device.id = tmp.device_id::VARCHAR) = 0
             </if>
             and longitude is not null
             and longitude != ''
@@ -236,7 +265,7 @@
         FROM (
             -- 子查询:拆分察打一体设备为侦测/反制两类
             SELECT
-                id,
+                d.id,
             CASE
             WHEN
                 device_type = '3' THEN '1'  -- 察打一体拆分为侦测
@@ -246,12 +275,15 @@
                 split_device_type
             FROM
                 ja_fw_device d
+            LEFT JOIN ja_fw_area_divide ad
+                ON d.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
+                AND ad.is_deleted = 0
             WHERE
                 d.is_deleted = 0
                 AND d.is_enabled = 1
-                AND status != 3
-            <if test="regionName != null and regionName != ''">
-                and (d.final_outbound_area = #{regionName}
+                AND d.status != 3
+            <if test="regionCode != null and regionCode != ''">
+                and (d.final_outbound_area_code like concat(#{regionCode}, '%')
                 <!-- 或者设备是共享给当前部门的 -->
                 <if test="currentDeptId != null and currentDeptId != '' ">
                     or d.id in (
@@ -262,11 +294,24 @@
                 </if>
                 )
             </if>
+            <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 = 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})
+                and (dsm.effective_date_end is null or dsm.effective_date_end &gt;= #{flyTime})
+                )
+            </if>
 
             UNION ALL  -- 合并拆分的反制部分
 
             SELECT
-                id,
+                d.id,
             CASE
             WHEN
                 device_type = '3' THEN '2'  -- 察打一体拆分为反制
@@ -276,13 +321,16 @@
                 split_device_type
             FROM
                 ja_fw_device d
+            LEFT JOIN ja_fw_area_divide ad
+                ON d.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
+                AND ad.is_deleted = 0
             WHERE
                 d.is_deleted = 0
                 AND is_enabled = 1
-                AND status != 3
+                AND d.status != 3
                 AND device_type = '3'
-            <if test="regionName != null and regionName != ''">
-                and (d.final_outbound_area = #{regionName}
+            <if test="regionCode != null and regionCode != ''">
+                and (d.final_outbound_area_code like concat(#{regionCode}, '%')
                 <!-- 或者设备是共享给当前部门的 -->
                 <if test="currentDeptId != null and currentDeptId != '' ">
                     or d.id in (
@@ -293,6 +341,19 @@
                 </if>
                 )
             </if>
+            <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 = 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})
+                and (dsm.effective_date_end is null or dsm.effective_date_end &gt;= #{flyTime})
+                )
+        </if>
             ) AS temp
         GROUP BY split_device_type
         ORDER BY split_device_type
@@ -308,20 +369,20 @@
         FROM
             ja_fw_device a
         LEFT JOIN
-                blade_dict_biz b ON (a.device_type = b.dict_key AND b.code = 'deviceType' AND b.parent_id != 0)
+                blade_dict_biz b ON (a.device_type = b.dict_key::VARCHAR AND b.code = 'deviceType' AND b.parent_id != 0)
         where a.is_deleted = 0
         <if test="deptList != null and deptList.size > 0">
             and ( a.create_dept in
             <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
                 #{deptId}
             </foreach>
-            <!-- <if test="currentDeptId != null and currentDeptId != '' "> -->
-            <!--     or a.id in ( -->
-            <!--     SELECT device_id FROM ja_fw_device_per_share -->
-            <!--     WHERE loan_to_dept_id = #{currentDeptId} -->
-            <!--     AND is_deleted = 0 -->
-            <!--     ) -->
-            <!-- </if> -->
+            <if test="currentDeptId != null and currentDeptId != '' ">
+                or a.id in (
+                SELECT device_id FROM ja_fw_device_per_share
+                WHERE loan_to_dept_id = #{currentDeptId}
+                AND is_deleted = 0
+                )
+            </if>
             )
         </if>
         group by a.device_type,b.dict_value
@@ -338,10 +399,6 @@
             d.is_deleted = 0
             AND d.is_enabled = 1
             AND d.final_outbound_area IS NOT NULL
-        <!-- <if test="effectiveRangeKmIsNotNull != null and effectiveRangeKmIsNotNull == 1"> -->
-        <!--     and d.effective_range_km is not null -->
-        <!--     and d.effective_range_km > 0 -->
-        <!-- </if> -->
         <if test="effectiveRangeKmIsNotNull != null and effectiveRangeKmIsNotNull == 2">
             and (d.effective_range_km is null or d.effective_range_km = 0)
         </if>
@@ -373,10 +430,18 @@
         WHERE
             is_deleted = 0
         <if test="deptList != null and deptList.size > 0">
-            and create_dept in
+            and ( create_dept in
             <foreach collection="deptList" item="deptId" open="(" separator="," close=")">
                 #{deptId}
             </foreach>
+            <if test="currentDeptId != null and currentDeptId != '' ">
+                or id in (
+                SELECT device_id FROM ja_fw_device_per_share
+                WHERE loan_to_dept_id = #{currentDeptId}
+                AND is_deleted = 0
+                )
+            </if>
+            )
         </if>
         GROUP BY
             manufacturer
@@ -390,11 +455,14 @@
                  COUNT(*)
              FROM
                  ja_fw_device d
+            left join ja_fw_area_divide ad
+                on d.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
+                and ad.is_deleted = 0
              WHERE
                  d.is_deleted = 0
                and d.is_enabled = 1
-                <if test="regionName != null and regionName != ''">
-                    and (d.final_outbound_area = #{regionName}
+                <if test="regionCode != null and regionCode != ''">
+                    and (d.final_outbound_area_code like concat(#{regionCode},'%')
                     <!-- 或者设备是共享给当前部门的 -->
                     <if test="currentDeptId != null and currentDeptId != '' ">
                         or d.id in (
@@ -405,18 +473,34 @@
                     </if>
                     )
                 </if>
+                <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 = 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})
+                    and (dsm.effective_date_end is null or dsm.effective_date_end &gt;= #{flyTime})
+                    )
+                </if>
              ) AS deviceCount,
             -- 无线电设备数量
             (SELECT
                  COUNT(*)
              FROM
                  ja_fw_device d
+            left join ja_fw_area_divide ad
+                on d.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
+                and ad.is_deleted = 0
              WHERE
                  d.is_deleted = 0
                and d.is_enabled = 1
                AND device_att = '1'
-                <if test="regionName != null and regionName != ''">
-                and (d.final_outbound_area = #{regionName}
+                <if test="regionCode != null and regionCode != ''">
+                and (d.final_outbound_area_code like concat(#{regionCode},'%')
                 <!-- 或者设备是共享给当前部门的 -->
                     <if test="currentDeptId != null and currentDeptId != '' ">
                         or d.id in (
@@ -427,17 +511,33 @@
                     </if>
                     )
                 </if>
+                <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 = 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})
+                    and (dsm.effective_date_end is null or dsm.effective_date_end &gt;= #{flyTime})
+                    )
+                </if>
              ) AS radioCount,
             -- 光电设备数量
             (SELECT
                  COUNT(*)
              FROM
                  ja_fw_device d
+            left join ja_fw_area_divide ad
+                on d.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
+                and ad.is_deleted = 0
              WHERE d.is_deleted = 0
                and d.is_enabled = 1
                AND device_att = '2'
-            <if test="regionName != null and regionName != ''">
-                and (d.final_outbound_area = #{regionName}
+            <if test="regionCode != null and regionCode != ''">
+                and (d.final_outbound_area_code like concat(#{regionCode},'%')
                 <!-- 或者设备是共享给当前部门的 -->
                 <if test="currentDeptId != null and currentDeptId != '' ">
                     or d.id in (
@@ -448,16 +548,32 @@
                 </if>
                 )
             </if>
+            <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 = 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})
+                and (dsm.effective_date_end is null or dsm.effective_date_end &gt;= #{flyTime})
+                )
+            </if>
              ) AS opticalCount,
             -- 雷达设备数量
             (SELECT
                  COUNT(*)
              FROM ja_fw_device d
+             left join ja_fw_area_divide ad
+                on d.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
+                and ad.is_deleted = 0
              WHERE d.is_deleted = 0
                and d.is_enabled = 1
                AND device_att = '3'
-                <if test="regionName != null and regionName != ''">
-                    and (d.final_outbound_area = #{regionName}
+                <if test="regionCode != null and regionCode != ''">
+                and (d.final_outbound_area_code like concat(#{regionCode},'%')
                     <!-- 或者设备是共享给当前部门的 -->
                     <if test="currentDeptId != null and currentDeptId != '' ">
                         or d.id in (
@@ -466,6 +582,19 @@
                         AND is_deleted = 0
                         )
                     </if>
+                    )
+                </if>
+                <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 = 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})
+                    and (dsm.effective_date_end is null or dsm.effective_date_end &gt;= #{flyTime})
                     )
                 </if>
              ) AS radarCount,
@@ -473,11 +602,14 @@
             (SELECT
                  COUNT(*)
              FROM ja_fw_device d
+            left join ja_fw_area_divide ad
+                on d.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
+                and ad.is_deleted = 0
              WHERE d.is_deleted = 0
                and d.is_enabled = 1
-               AND status in ('1', '2', '3' )
-                <if test="regionName != null and regionName != ''">
-                    and (d.final_outbound_area = #{regionName}
+               AND d.status in ('1', '2', '3' )
+                <if test="regionCode != null and regionCode != ''">
+                and (d.final_outbound_area_code like concat(#{regionCode},'%')
                     <!-- 或者设备是共享给当前部门的 -->
                     <if test="currentDeptId != null and currentDeptId != '' ">
                         or d.id in (
@@ -488,19 +620,56 @@
                     </if>
                     )
                 </if>
+                <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 = 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})
+                    and (dsm.effective_date_end is null or dsm.effective_date_end &gt;= #{flyTime})
+                    )
+                </if>
              ) AS deviceAlarmCount
     </select>
 
     <select id="selectCockpitDevicePage" resultType="org.sxkj.fw.device.vo.CockpitFwDeviceVO">
         select
-            d.*
+            d.*,
+            min(ad.id) as area_divide_id,
+            min(dsm.id) as defense_scene_manage_id
         from
             ja_fw_device d
+        left join ja_fw_area_divide ad
+            on d.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
+            and ad.is_deleted = 0
+        left join ja_fw_defense_scene ds
+            on ad.id = ANY(string_to_array(ds.area_divide_ids, ',')::bigint[])
+            and ds.is_deleted = 0
+        left join ja_fw_defense_scene_manage dsm
+            on dsm.defense_scene_id = ds.id::VARCHAR
+            and dsm.is_deleted = 0
         <where>
-            d.is_deleted = 0
-            and d.is_enabled = 1
-            <if test="param2.regionName != null and param2.regionName != ''">
-                and (d.final_outbound_area = #{param2.regionName}
+                d.is_deleted = 0
+                and d.is_enabled = 1
+            <if test=" param2.flyTime != null">
+                and exists (
+                select 1
+                from ja_fw_defense_scene ds
+                join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = 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;= #{param2.flyTime})
+                and (dsm.effective_date_end is null or dsm.effective_date_end &gt;= #{param2.flyTime})
+                )
+            </if>
+            <if test="param2.regionCode != null and param2.regionCode != ''">
+                and (d.final_outbound_area_code like concat(#{param2.regionCode},'%')
                 <!-- 或者设备是共享给当前部门的 -->
                 <if test="param2.currentDeptId != null and param2.currentDeptId != '' ">
                     or d.id in (
@@ -557,13 +726,15 @@
                 </foreach>
             </if>
         </where>
+            group by d.id
     </select>
 
     <update id="updateTrackStatusByDeviceId">
         update
             ja_fw_device
         set track_status = #{trackStatus},
-            final_outbound_area = #{outTarget}
+            final_outbound_area = #{outTarget},
+            final_outbound_area_code = #{outTargetCode}
         where id = #{deviceId}
           and is_deleted = 0
     </update>
@@ -580,7 +751,7 @@
             END AS isShared
         FROM
             ja_fw_device d
-            LEFT JOIN ja_fw_device_per_share ps ON ps.device_id = d.id
+            LEFT JOIN ja_fw_device_per_share ps ON ps.device_id = d.id::VARCHAR
             AND ps.loan_to_dept_id = #{currentDeptId}
             AND ps.is_deleted = 0
         WHERE
@@ -592,4 +763,46 @@
           AND d.final_outbound_area != #{regionName}
     </select>
 
+    <select id="getDeviceStatistics" resultType="org.sxkj.fw.cockpit.vo.DeviceStatisticsVO">
+        SELECT
+            d.final_outbound_area AS type,
+            COUNT(*) AS count
+        FROM
+            ja_fw_device d
+        LEFT JOIN ja_fw_area_divide ad
+        ON d.id = ANY(string_to_array(ad.device_ids, ',')::bigint[])
+        AND ad.is_deleted = 0
+        WHERE
+            d.is_deleted = 0
+        AND d.is_enabled = 1
+        AND d.final_outbound_area IS NOT NULL
+        <if test="regionCode != null and regionCode != ''">
+            and ( d.final_outbound_area_code::text LIKE concat(#{regionCode}, '%')
+            <if test="currentDeptId != null and currentDeptId != '' ">
+                or d.id IN (
+                SELECT device_id::bigint
+                FROM ja_fw_device_per_share
+                WHERE loan_to_dept_id = #{currentDeptId}
+                AND is_deleted = 0
+                )
+            </if>
+            )
+        </if>
+        <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 = 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)
+            )
+        </if>
+        GROUP BY
+        d.final_outbound_area
+    </select>
+
 </mapper>

--
Gitblit v1.9.3