Skip to content

B
byit-myth-job
Commit 394fd8af by huangfusuper
Options

Merge remote-tracking branch 'origin/developer' into developer

parents e43c2848 86f1684c
Showing with 64 additions and 10 deletions
byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobTask.java
......@@ -2,13 +2,13 @@ package com.byit.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
*
*/
......@@ -189,6 +189,12 @@ public class JobTask implements Serializable {
private String runSource;
/**
* 是否上级运行成功时运行（0 是 1 否）
*/
@ApiModelProperty("是否上级运行成功时运行（0 是 1 否）")
private String superSuccessRun;
/**
*/
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobTaskRunLog.java
......@@ -169,6 +169,12 @@ public class JobTaskRunLog implements Serializable {
private String logFileName;
/**
* 是否上级运行成功时运行（0 是 1 否）
*/
@ApiModelProperty("是否上级运行成功时运行（0 是 1 否）")
private String superSuccessRun;
/**
*
*/
private static final long serialVersionUID = 1L;
......
byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobTaskSchedule.java
......@@ -2,9 +2,10 @@ package com.byit.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import lombok.Data;
import java.io.Serializable;
/**
*
*/
......@@ -188,6 +189,12 @@ public class JobTaskSchedule implements Serializable {
private String runSource;
/**
* 是否上级运行成功时运行（0 是 1 否）
*/
@ApiModelProperty("是否上级运行成功时运行（0 是 1 否）")
private String superSuccessRun;
/**
*/
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskMapper.xml
......@@ -31,6 +31,7 @@
<result column="version_name" jdbcType="VARCHAR" property="versionName" />
<result column="run_command" jdbcType="VARCHAR" property="runCommand" />
<result column="flow_name" jdbcType="VARCHAR" property="flowName" />
<result column="super_success_run" jdbcType="CHAR" property="superSuccessRun"/>
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.JobTask">
<!-- generated @mbg.generated date: 2019-12-25 -->
......@@ -42,7 +43,7 @@
job_type, handler_name, node_desc, node_name, map_flow_id, node_timeout, is_virtual,
plugin_urls, priority, failed_retry_interval, routing_strategy, run_id, run_param,
run_source_desc, script_urls, source_principal, trigger_time, trigger_status, version_name,
run_command,flow_name
run_command,flow_name, super_success_run
</sql>
<sql id="Blob_Column_List">
run_source
......@@ -158,6 +159,9 @@
<if test="flowName != null">
flow_name,
</if>
<if test="superSuccessRun != null">
super_success_run,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -247,6 +251,9 @@
<if test="flowName != null">
#{flowName,jdbcType=VARCHAR},
</if>
<if test="superSuccessRun != null">
#{superSuccessRun,jdbcType=CHAR},
</if>
</trim>
</insert>
......@@ -256,7 +263,7 @@
job_type, handler_name, node_desc, node_name, map_flow_id, node_timeout, is_virtual,
plugin_urls, priority, failed_retry_interval, routing_strategy, run_id, run_param,
run_source_desc, script_urls, source_principal, trigger_time, trigger_status, version_name,
run_command,run_source,flow_name
run_command,run_source,flow_name,super_success_run
) values
<foreach collection="jobTasks" item="jobTask" separator =",">
(
......@@ -268,7 +275,7 @@
#{jobTask.runParam,jdbcType=VARCHAR},#{jobTask.runSourceDesc,jdbcType=VARCHAR},#{jobTask.scriptUrls,jdbcType=VARCHAR},
#{jobTask.sourcePrincipal,jdbcType=VARCHAR},#{jobTask.triggerTime,jdbcType=BIGINT},#{jobTask.triggerStatus,jdbcType=CHAR},
#{jobTask.versionName,jdbcType=VARCHAR},#{jobTask.runCommand,jdbcType=VARCHAR},#{jobTask.runSource,jdbcType=LONGVARCHAR},
#{jobTask.flowName,jdbcType=VARCHAR}
#{jobTask.flowName,jdbcType=VARCHAR},#{jobTask.superSuccessRun,jdbcType=CHAR}
)
</foreach>
......@@ -362,6 +369,9 @@
<if test="runSource != null">
flow_name = #{flowName,jdbcType=VARCHAR},
</if>
<if test="superSuccessRun != null">
super_success_run = #{superSuccessRun,jdbcType=CHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskRunLogMapper.xml
......@@ -27,6 +27,7 @@
<result column="run_id" jdbcType="VARCHAR" property="runId" />
<result column="re_run_id" jdbcType="VARCHAR" property="reRunId" />
<result column="log_file_name" jdbcType="VARCHAR" property="logFileName" />
<result column="super_success_run" jdbcType="CHAR" property="superSuccessRun"/>
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.JobTaskRunLogWithBLOBs">
<result column="run_msg" jdbcType="LONGVARCHAR" property="runMsg" />
......@@ -36,7 +37,7 @@
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,
trigger_time, job_group_ip, map_flow_id, run_command, end_time, node_id,job_type,alert_end,run_id,re_run_id
,log_file_name
,log_file_name, super_success_run
</sql>
<sql id="Blob_Column_List">
run_msg, trigger_msg
......@@ -172,6 +173,9 @@
<if test="logFileName != null">
log_file_name,
</if>
<if test="superSuccessRun != null">
super_success_run,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="logId != null">
......@@ -255,6 +259,9 @@
<if test="logFileName != null">
#{logFileName,jdbcType=VARCHAR},
</if>
<if test="superSuccessRun != null">
#{superSuccessRun,jdbcType=CHAR},
</if>
</trim>
</insert>
<update id="updateJobTaskRunLogWithBLOBs" parameterType="com.byit.model.JobTaskRunLogWithBLOBs">
......@@ -338,6 +345,9 @@
<if test="logFileName != null">
log_file_name = #{logFileName,jdbcType=VARCHAR},
</if>
<if test="superSuccessRun != null">
super_success_run = #{superSuccessRun,jdbcType=CHAR},
</if>
</set>
where log_id = #{logId,jdbcType=INTEGER}
</update>
......@@ -416,6 +426,9 @@
<if test="logFileName != null">
log_file_name = #{logFileName,jdbcType=VARCHAR},
</if>
<if test="superSuccessRun != null">
super_success_run = #{superSuccessRun,jdbcType=CHAR},
</if>
</set>
where log_id = #{logId,jdbcType=INTEGER}
</update>
......
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskScheduleMapper.xml
......@@ -32,6 +32,7 @@
<result column="log_id" jdbcType="INTEGER" property="logId"/>
<result column="run_command" jdbcType="VARCHAR" property="runCommand"/>
<result column="flow_name" jdbcType="VARCHAR" property="flowName"/>
<result column="super_success_run" jdbcType="CHAR" property="superSuccessRun"/>
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.JobTaskSchedule">
......@@ -43,7 +44,7 @@
job_type, handler_name, node_desc, node_name, map_flow_id, node_timeout, is_virtual,
plugin_urls, priority, failed_retry_interval, routing_strategy, run_id, run_param,
run_source_desc, script_urls, source_principal, trigger_time, trigger_status, version_name,
log_id, run_command,flow_name
log_id, run_command,flow_name, super_success_run
</sql>
<sql id="Blob_Column_List">
run_source
......@@ -166,6 +167,9 @@
<if test="flowName != null">
flow_name,
</if>
<if test="superSuccessRun != null">
super_success_run,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -258,6 +262,9 @@
<if test="flowName != null">
#{flowName,jdbcType=VARCHAR},
</if>
<if test="superSuccessRun != null">
#{superSuccessRun,jdbcType=CHAR},
</if>
</trim>
</insert>
......@@ -271,7 +278,7 @@
run_id, run_param, run_source_desc,
script_urls, source_principal, trigger_time,
trigger_status, version_name, log_id,
run_command, run_source,flow_name
run_command, run_source,flow_name, super_success_run
)
values
<foreach collection="jobTaskSchedules" item="jobTaskSchedule" separator=",">
......@@ -295,7 +302,7 @@
#{jobTaskSchedule.triggerStatus,jdbcType=CHAR}, #{jobTaskSchedule.versionName,jdbcType=VARCHAR},
#{jobTaskSchedule.logId,jdbcType=INTEGER},
#{jobTaskSchedule.runCommand,jdbcType=VARCHAR}, #{jobTaskSchedule.runSource,jdbcType=LONGVARCHAR},
#{jobTaskSchedule.flowName,jdbcType=VARCHAR}
#{jobTaskSchedule.flowName,jdbcType=VARCHAR}, #{jobTaskSchedule.superSuccessRun,jdbcType=CHAR}
)
</foreach>
</insert>
......@@ -391,6 +398,9 @@
<if test="flowName != null">
flow_name = #{flowName,jdbcType=VARCHAR},
</if>
<if test="superSuccessRun != null">
super_success_run = #{superSuccessRun,jdbcType=CHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......
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