From 4e48664942bbefe70699ca43d25cbbd56ecc8daa Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Mon, 19 Jan 2026 15:17:12 +0800
Subject: [PATCH] update-维修计划状态更新、新增定时器修改状态

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml |   63 +++++++++++++++++++++++++++++++
 1 files changed, 63 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 9cf89bc..0fd9a55 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
@@ -23,6 +23,8 @@
         <result column="detect_target_cnt" property="detectTargetCnt"/>
         <result column="effective_range_km" property="effectiveRangeKm"/>
         <result column="work_mode" property="workMode"/>
+        <result column="latitude" property="latitude"/>
+        <result column="longitude" property="longitude"/>
         <result column="area_code" property="areaCode"/>
         <result column="device_sn" property="deviceSn"/>
         <result column="create_user" property="createUser"/>
@@ -76,6 +78,9 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="param2.status != null">
+                and status = #{param2.status}
+            </if>
         </where>
     </select>
 
@@ -119,6 +124,9 @@
                     </choose>
                 )
             </if>
+            <if test="status != null">
+                and status = #{status}
+            </if>
         </where>
     </select>
 
@@ -163,6 +171,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