From 6abbb1b33efd0ae82bf036ba4321e7489bbe3076 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Mon, 19 Jan 2026 16:43:19 +0800
Subject: [PATCH] update-设备统计

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml |    8 +++++++-
 1 files changed, 7 insertions(+), 1 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 9be0f2b..ad1b803 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
@@ -78,6 +78,9 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="param2.status != null">
+                and status = #{param2.status}
+            </if>
         </where>
     </select>
 
@@ -120,6 +123,9 @@
                         </otherwise>
                     </choose>
                 )
+            </if>
+            <if test="status != null">
+                and status = #{status}
             </if>
         </where>
     </select>
@@ -167,7 +173,7 @@
 
     <!-- 获取设备类型统计数据 -->
     <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
+        SELECT a.device_type,b.dict_value AS device_type_value,count(*) device_count, (SELECT COUNT(*) FROM ja_fw_device where is_deleted = 0) as total_devices
         FROM ja_fw_device a
         LEFT JOIN blade_dict_biz b ON (
             a.device_type = b.dict_key

--
Gitblit v1.9.3