From ac357f580f3aace2112441463ebaf203222bf4f7 Mon Sep 17 00:00:00 2001
From: shih <510524130@qq.com>
Date: Sat, 9 May 2026 14:36:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E6=80=81=E6=A0=87=E8=AE=B0=E7=82=B9?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/iot/lidee/iot/domain/Device.java   |  3 +++
 .../lidee/iot/mapper/bygz/DevGzbxWxgdMapper.java |  3 +++
 .../impl/DeviceMaintenanceRepairServiceImpl.java |  7 ++++++-
 .../resources/mapper/iot/DevGzbxWxgdMapper.xml   | 16 ++++++++++++++++
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/lidee-service/lidee-iot-service/src/main/java/iot/lidee/iot/domain/Device.java b/lidee-service/lidee-iot-service/src/main/java/iot/lidee/iot/domain/Device.java
index d212679..07c4803 100644
--- a/lidee-service/lidee-iot-service/src/main/java/iot/lidee/iot/domain/Device.java
+++ b/lidee-service/lidee-iot-service/src/main/java/iot/lidee/iot/domain/Device.java
@@ -213,6 +213,9 @@ public class Device extends BaseEntity
     @TableField(exist = false)
     private Boolean canConfigPoll = false;
 
+    @TableField(exist = false)
+    private List<DeviceLog> logs;
+
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
diff --git a/lidee-service/lidee-iot-service/src/main/java/iot/lidee/iot/mapper/bygz/DevGzbxWxgdMapper.java b/lidee-service/lidee-iot-service/src/main/java/iot/lidee/iot/mapper/bygz/DevGzbxWxgdMapper.java
index 4436d1b..efeb624 100644
--- a/lidee-service/lidee-iot-service/src/main/java/iot/lidee/iot/mapper/bygz/DevGzbxWxgdMapper.java
+++ b/lidee-service/lidee-iot-service/src/main/java/iot/lidee/iot/mapper/bygz/DevGzbxWxgdMapper.java
@@ -5,6 +5,7 @@ package iot.lidee.iot.mapper.bygz;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import iot.lidee.framework.mybatis.mapper.BaseMapperX;
 import iot.lidee.iot.domain.Device;
+import iot.lidee.iot.domain.DeviceLog;
 import iot.lidee.iot.model.bygz.DevGzbxWxgdDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -23,4 +24,6 @@ public interface DevGzbxWxgdMapper extends BaseMapperX<DevGzbxWxgdDO> {
     List<DevGzbxWxgdDO> selectWxgdByType(String devtype);
 
     List<Device> deviceList(String devtype);
+
+    List<DeviceLog> deviceLogList(String serialNumber);
 }
diff --git a/lidee-service/lidee-iot-service/src/main/java/iot/lidee/iot/service/impl/DeviceMaintenanceRepairServiceImpl.java b/lidee-service/lidee-iot-service/src/main/java/iot/lidee/iot/service/impl/DeviceMaintenanceRepairServiceImpl.java
index fad29dd..33327d2 100644
--- a/lidee-service/lidee-iot-service/src/main/java/iot/lidee/iot/service/impl/DeviceMaintenanceRepairServiceImpl.java
+++ b/lidee-service/lidee-iot-service/src/main/java/iot/lidee/iot/service/impl/DeviceMaintenanceRepairServiceImpl.java
@@ -93,6 +93,11 @@ public class DeviceMaintenanceRepairServiceImpl implements IDeviceMaintenanceRep
      */
     @Override
     public List<Device> deviceList(String devtype) {
-        return devGzbxWxgdMapper.deviceList(devtype);
+        List<Device> devices = devGzbxWxgdMapper.deviceList(devtype);
+
+        for (Device device : devices) {
+            device.setLogs(devGzbxWxgdMapper.deviceLogList(device.getSerialNumber()));
+        }
+        return devices;
     }
 }
\ No newline at end of file
diff --git a/lidee-service/lidee-iot-service/src/main/resources/mapper/iot/DevGzbxWxgdMapper.xml b/lidee-service/lidee-iot-service/src/main/resources/mapper/iot/DevGzbxWxgdMapper.xml
index b717329..fad4f22 100644
--- a/lidee-service/lidee-iot-service/src/main/resources/mapper/iot/DevGzbxWxgdMapper.xml
+++ b/lidee-service/lidee-iot-service/src/main/resources/mapper/iot/DevGzbxWxgdMapper.xml
@@ -65,4 +65,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             w.del_flag = 0 AND g.group_id = #{devtype}
     </select>
 
+
+    <select id="deviceLogList"  resultType="iot.lidee.iot.domain.DeviceLog">
+
+        SELECT
+               *
+        FROM (
+                 SELECT *,
+                        ROW_NUMBER() OVER (PARTITION BY identity ORDER BY create_time DESC) AS rn
+                 FROM
+                      iot_device_log
+                 WHERE
+                       serial_number = #{serialNumber}
+             ) t
+        WHERE rn = 1
+    </select>
+
 </mapper>