Commit 6396ec6f by huangfusuper

【数据库增加字段】日志表增加是否完成日志告警

parent 9c14ff94
...@@ -31,6 +31,7 @@ public class LogCallbackThread implements Runnable { ...@@ -31,6 +31,7 @@ public class LogCallbackThread implements Runnable {
jobTaskRunLog.setStartTime(jobRunResultDto.getEndTime()); jobTaskRunLog.setStartTime(jobRunResultDto.getEndTime());
jobTaskRunLog.setRunCode(jobRunResultDto.getReturnResult().getCode()); jobTaskRunLog.setRunCode(jobRunResultDto.getReturnResult().getCode());
jobTaskRunLog.setRunMsg(jobRunResultDto.getReturnResult().getMsg()); jobTaskRunLog.setRunMsg(jobRunResultDto.getReturnResult().getMsg());
jobTaskRunLog.setAlertEnd("0");
mythJobTaskRunLogService.updateJobTaskRunLog(jobTaskRunLog); mythJobTaskRunLogService.updateJobTaskRunLog(jobTaskRunLog);
} }
} }
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
<result column="run_command" jdbcType="VARCHAR" property="runCommand" /> <result column="run_command" jdbcType="VARCHAR" property="runCommand" />
<result column="end_time" jdbcType="TIMESTAMP" property="endTime" /> <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
<result column="node_id" jdbcType="INTEGER" property="nodeId" /> <result column="node_id" jdbcType="INTEGER" property="nodeId" />
<result column="alert_end" jdbcType="CHAR" property="alertEnd" />
<result column="job_type" jdbcType="CHAR" property="jobType" />
</resultMap> </resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.JobTaskRunLogWithBLOBs"> <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.JobTaskRunLogWithBLOBs">
<result column="run_msg" jdbcType="LONGVARCHAR" property="runMsg" /> <result column="run_msg" jdbcType="LONGVARCHAR" property="runMsg" />
...@@ -30,7 +32,7 @@ ...@@ -30,7 +32,7 @@
<sql id="Base_Column_List"> <sql id="Base_Column_List">
log_id, failed_remaining_count, version_name, flow_id, flow_name, job_group_id, handler_name, log_id, failed_remaining_count, version_name, flow_id, flow_name, job_group_id, handler_name,
node_name, is_virtual, run_code, run_params, start_time, run_type, trigger_code, node_name, is_virtual, run_code, run_params, start_time, run_type, trigger_code,
trigger_time, job_group_ip, map_flow_id, run_command, end_time, node_id,job_type trigger_time, job_group_ip, map_flow_id, run_command, end_time, node_id,job_type,alert_end
</sql> </sql>
<sql id="Blob_Column_List"> <sql id="Blob_Column_List">
run_msg, trigger_msg run_msg, trigger_msg
...@@ -116,6 +118,9 @@ ...@@ -116,6 +118,9 @@
<if test="jobType != null"> <if test="jobType != null">
job_type, job_type,
</if> </if>
<if test="alertEnd != null">
alert_end,
</if>
<if test="runMsg != null"> <if test="runMsg != null">
run_msg, run_msg,
</if> </if>
...@@ -187,6 +192,9 @@ ...@@ -187,6 +192,9 @@
<if test="jobType != null"> <if test="jobType != null">
#{jobType,jdbcType=VARCHAR}, #{jobType,jdbcType=VARCHAR},
</if> </if>
<if test="alertEnd != null">
#{alertEnd,jdbcType=VARCHAR},
</if>
<if test="runMsg != null"> <if test="runMsg != null">
#{runMsg,jdbcType=LONGVARCHAR}, #{runMsg,jdbcType=LONGVARCHAR},
</if> </if>
...@@ -258,6 +266,9 @@ ...@@ -258,6 +266,9 @@
<if test="jobType != null"> <if test="jobType != null">
job_type = #{jobType,jdbcType=VARCHAR}, job_type = #{jobType,jdbcType=VARCHAR},
</if> </if>
<if test="alertEnd != null">
alert_end = #{alertEnd,jdbcType=VARCHAR},
</if>
<if test="runMsg != null"> <if test="runMsg != null">
run_msg = #{runMsg,jdbcType=LONGVARCHAR}, run_msg = #{runMsg,jdbcType=LONGVARCHAR},
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment