From 46b35a8bbb4767b2a28b03a88f705d18c9dbf426 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 14 Jan 2026 15:02:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 55 insertions(+), 0 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 aa329fe..9be0f2b 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
@@ -165,6 +165,61 @@
         ORDER BY split_device_type
     </select>
 
+    <!-- 获取设备类型统计数据 -->
+    <select id="getDeviceTypeStatistics" resultType="org.sxkj.fw.device.vo.DeviceTypeStatisticsVO">
+        SELECT a.device_type,b.dict_value AS device_type_value,count(*) device_count, (SELECT COUNT(*) FROM ja_fw_device) as total_devices
+        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
+        ) where a.is_deleted = 0
+        group by a.device_type,b.dict_value
+    </select>
+
+    <!-- 设备出库去向统计 -->
+    <select id="getDeviceOutStatistics" resultType="org.sxkj.fw.cockpit.vo.DeviceStatisticsVO">
+        SELECT
+            t.out_target AS type,
+            COUNT(*) AS count
+        FROM
+            ja_fw_device d
+                LEFT JOIN (
+                SELECT
+                    device_id,
+                    out_target,
+                    ROW_NUMBER() OVER (
+                        PARTITION BY
+                            device_id
+                        ORDER BY
+                            create_time DESC
+                        ) AS rn
+                FROM
+                    ja_fw_device_track
+                WHERE
+                    out_target IS NOT NULL
+            ) t ON d.id = t.device_id
+                AND t.rn = 1
+        WHERE
+            d.is_deleted = 0
+          AND t.out_target IS NOT NULL
+        GROUP BY
+            t.out_target;
+    </select>
+
+    <!--  设备生产厂商统计  -->
+    <select id="getDeviceManufacturerStatistics" resultType="org.sxkj.fw.cockpit.vo.DeviceStatisticsVO">
+        SELECT
+            manufacturer AS type,
+            COUNT(*) AS count
+        FROM
+            ja_fw_device
+        WHERE
+            is_deleted = 0
+        GROUP BY
+            manufacturer
+    </select>
+
      <!-- 查询设备总数 + 无线电/光电/雷达设备数量 -->
     <select id="statisticalDeviceAtt" resultType="org.sxkj.fw.cockpit.vo.AlarmStatisticsVO">
         SELECT

--
Gitblit v1.9.3