From d701a834b3f8ab881e091de0881517abf70d359d Mon Sep 17 00:00:00 2001
From: daiyongfei <974332738@qq.com>
Date: Wed, 8 Oct 2025 09:37:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87IMEI=20=E6=A8=A1=E7=B3=8A?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/equipment/DeviceMapper.xml         | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
index 92fa6447..76dfcd90 100644
--- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
+++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
@@ -59,11 +59,11 @@
             <if test="criteria.deviceName != null and criteria.deviceName.trim() != ''">
                 and d.device_name like concat('%', TRIM(#{criteria.deviceName}), '%')
             </if>
-            <if test="criteria.deviceMac != null">
-                and d.device_mac = #{criteria.deviceMac}
+            <if test="criteria.deviceMac != null and criteria.deviceMac.trim() != ''">
+                and d.device_mac like concat('%', TRIM(#{criteria.deviceMac}), '%')
             </if>
-            <if test="criteria.deviceImei != null">
-                and d.device_imei = #{criteria.deviceImei}
+            <if test="criteria.deviceImei != null and criteria.deviceImei.trim() != ''">
+                and d.device_imei like concat('%', TRIM(#{criteria.deviceImei}), '%')
             </if>
             <if test="criteria.deviceType != null">
                 and d.device_type = #{criteria.deviceType}
@@ -453,7 +453,7 @@
     </select>
 
     <!-- 获取设备使用频次统计 -->
-    <select id="getDeviceUsageFrequency" resultType="com.fuyuanshen.equipment.domain.vo.DeviceUsageFrequencyVo">
+    <select id="getDeviceUsageFrequency1" resultType="com.fuyuanshen.equipment.domain.vo.DeviceUsageFrequencyVo">
         SELECT 
             device_name AS deviceName,
             COUNT(*) AS frequency
@@ -462,6 +462,17 @@
         GROUP BY device_name
         ORDER BY frequency DESC
     </select>
+    <!-- 获取设备使用频次统计 （设备类型）-->
+    <select id="getDeviceUsageFrequency" resultType="com.fuyuanshen.equipment.domain.vo.DeviceUsageFrequencyVo">
+        SELECT
+            d.type_name AS deviceName,
+            COUNT(*) AS frequency
+        FROM device_log dl
+        LEFT JOIN device d ON dl.device_id = d.id
+        WHERE dl.create_time >= DATE_SUB(NOW(), INTERVAL #{days} DAY)
+        GROUP BY d.device_type, d.type_name
+        ORDER BY frequency DESC
+    </select>
 
     <!-- 根据设备IMEI查询设备 -->
     <select id="selectDeviceByImei" resultType="com.fuyuanshen.equipment.domain.Device">