From 0f803c242ed66f2afe147505bd92e7ff8bdd245e Mon Sep 17 00:00:00 2001
From: zhuangtianxiang <2913129173@qq.com>
Date: Wed, 12 Mar 2025 11:19:26 +0800
Subject: [PATCH] =?UTF-8?q?refactor(iot):=20=E9=87=8D=E6=9E=84=20EventLogM?=
 =?UTF-8?q?apper=20=E6=98=A0=E5=B0=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 resultMap "EventLogMap"，使用 JacksonTypeHandler 处理
---
 .../resources/mappers/iot/EventLogMapper.xml   | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mappers/iot/EventLogMapper.xml b/src/main/resources/mappers/iot/EventLogMapper.xml
index ac9be51..0c783f2 100644
--- a/src/main/resources/mappers/iot/EventLogMapper.xml
+++ b/src/main/resources/mappers/iot/EventLogMapper.xml
@@ -3,8 +3,22 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zsc.edu.gateway.modules.iot.tsl.repo.EventLogRepository">
-    <select id="selectList" resultType="com.zsc.edu.gateway.modules.iot.tsl.entity.EventLog">
-        select iel.*, ird.content as recordDataContent, ird.client_id as clientId, ird.record_time as recordTime
+
+    <resultMap id="EventLogMap" type="com.zsc.edu.gateway.modules.iot.tsl.entity.EventLog">
+        <id column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="record_id" property="recordId"/>
+        <association property="recordData" javaType="com.zsc.edu.gateway.modules.iot.record.entity.RecordData">
+            <result column="client_id" property="clientId"/>
+            <result column="content" property="content"
+                    typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+            <result column="record_time" property="recordTime"/>
+            <result column="dept_id" property="deptId"/>
+        </association>
+    </resultMap>
+
+    <select id="selectList" resultMap="EventLogMap">
+        select iel.*, ird.*
         from iot_event_log iel,
              iot_record_data ird
         where iel.record_id = ird.id