From 99c761a99f41279e3c98bfb0d25a02343e7546f3 Mon Sep 17 00:00:00 2001
From: wushengyeyouya <690574002@qq.com>
Date: Wed, 2 Mar 2022 14:32:08 +0800
Subject: [PATCH] Fix the problem that alert records will persistent failed by
 dao.

---
 .../manager/dao/impl/StreamAlertMapper.xml      | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/streamis-jobmanager/streamis-job-manager/streamis-job-manager-base/src/main/java/com/webank/wedatasphere/streamis/jobmanager/manager/dao/impl/StreamAlertMapper.xml b/streamis-jobmanager/streamis-job-manager/streamis-job-manager-base/src/main/java/com/webank/wedatasphere/streamis/jobmanager/manager/dao/impl/StreamAlertMapper.xml
index f5b74ea5f..736e9f993 100644
--- a/streamis-jobmanager/streamis-job-manager/streamis-job-manager-base/src/main/java/com/webank/wedatasphere/streamis/jobmanager/manager/dao/impl/StreamAlertMapper.xml
+++ b/streamis-jobmanager/streamis-job-manager/streamis-job-manager-base/src/main/java/com/webank/wedatasphere/streamis/jobmanager/manager/dao/impl/StreamAlertMapper.xml
@@ -19,13 +19,26 @@
 
 <mapper namespace="com.webank.wedatasphere.streamis.jobmanager.manager.dao.StreamAlertMapper">
 
+    <resultMap id="StreamAlertRecordMap" type="com.webank.wedatasphere.streamis.jobmanager.manager.entity.StreamAlertRecord">
+        <id column="id" property="id" jdbcType="BIGINT"/>
+        <result column="alert_level" property="alertLevel" jdbcType="VARCHAR"/>
+        <result column="alert_user" property="alertUser" jdbcType="VARCHAR"/>
+        <result column="alert_msg" property="alertMsg" jdbcType="VARCHAR"/>
+        <result column="job_id" property="jobId" jdbcType="VARCHAR"/>
+        <result column="job_version_id" property="jobVersionId" jdbcType="TIMESTAMP"/>
+        <result column="task_id" property="taskId" jdbcType="VARCHAR"/>
+        <result column="create_time" property="createTime" jdbcType="VARCHAR"/>
+        <result column="status" property="status" jdbcType="VARCHAR"/>
+        <result column="error_msg" property="errorMsg" jdbcType="VARCHAR"/>
+    </resultMap>
+
     <insert id="insert">
         insert into linkis_stream_alert_record (alert_level,alert_user,alert_msg,job_id,job_version_id,task_id,create_time,status,error_msg) values
-        (#{alertLevel},#{alertUser},#{alertMsg},#{jobId},#{jobVersionId},#{taskId},#{createTime},#{status},#{error_msg})
+        (#{alertLevel},#{alertUser},#{alertMsg},#{jobId},#{jobVersionId},#{taskId},#{createTime},#{status},#{errorMsg})
     </insert>
 
     <select id="getAlertByJobIdAndVersion"
-            resultType="com.webank.wedatasphere.streamis.jobmanager.manager.entity.StreamAlertRecord">
+            resultMap="StreamAlertRecordMap">
         select id, alert_level,alert_user,alert_msg,job_id,job_version_id,task_id,create_time,status,error_msg from linkis_stream_alert_record
         where alert_user = #{username} and job_id = #{jobId} and job_version_id = #{versionId}
     </select>