Commit e32c47dd by huangfusuper

【表增加字段】增加表字段

parent 6ff0a7cc
...@@ -133,6 +133,12 @@ public class JobFlow implements Serializable { ...@@ -133,6 +133,12 @@ public class JobFlow implements Serializable {
private Date addTime; private Date addTime;
/** /**
* 是否启动 0不启动 1启动
*/
@ApiModelProperty("是否启动 0不启动 1启动")
private String startUp;
/**
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }
\ No newline at end of file
...@@ -139,6 +139,12 @@ public class JobTaskRunLog implements Serializable { ...@@ -139,6 +139,12 @@ public class JobTaskRunLog implements Serializable {
private String triggerMsg; private String triggerMsg;
/** /**
* 任务版本名称
*/
@ApiModelProperty("任务版本名称")
private String jobVersionName;
/**
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }
\ No newline at end of file
...@@ -56,10 +56,6 @@ ...@@ -56,10 +56,6 @@
<property name="enableSubPackages" value="false"/> <property name="enableSubPackages" value="false"/>
</javaClientGenerator> </javaClientGenerator>
<table tableName="job_flow_current" domainObjectName="JobFlow" /> <table tableName="job_flow_current" domainObjectName="JobFlow" />
<table tableName="job_flow_node_current" domainObjectName="JobFlowNode" />
<table tableName="job_flow_node_version" domainObjectName="JobFlowNodeVersion" />
<table tableName="job_flow_run_recording" domainObjectName="JobFlowRunRecording" />
<table tableName="job_flow_version" domainObjectName="JobFlowVersion" />
</context> </context>
</generatorConfiguration> </generatorConfiguration>
...@@ -23,13 +23,14 @@ ...@@ -23,13 +23,14 @@
<result column="workspace_id" jdbcType="INTEGER" property="workspaceId" /> <result column="workspace_id" jdbcType="INTEGER" property="workspaceId" />
<result column="author" jdbcType="VARCHAR" property="author" /> <result column="author" jdbcType="VARCHAR" property="author" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" /> <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="start_up" jdbcType="CHAR" property="startUp" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!-- generated @mbg.generated date: 2019-12-24 --> <!-- generated @mbg.generated date: 2019-12-24 -->
flow_id, alarm_email, exec_type, flow_cron, flow_desc, flow_name, flow_node_count, flow_id, alarm_email, exec_type, flow_cron, flow_desc, flow_name, flow_node_count,
flow_timeout, is_have_depend, is_inner, is_top, mail_action, node_date_is_follow_flow, flow_timeout, is_have_depend, is_inner, is_top, mail_action, node_date_is_follow_flow,
priority, remaining_count, repeat_count, trigger_next_time, workspace_id, author, priority, remaining_count, repeat_count, trigger_next_time, workspace_id, author,
add_time add_time, start_up
</sql> </sql>
<select id="getById" parameterType="java.lang.Integer" resultMap="BaseResultMap"> <select id="getById" parameterType="java.lang.Integer" resultMap="BaseResultMap">
<!-- generated @mbg.generated date: 2019-12-24 --> <!-- generated @mbg.generated date: 2019-12-24 -->
...@@ -51,14 +52,16 @@ ...@@ -51,14 +52,16 @@
is_inner, is_top, mail_action, is_inner, is_top, mail_action,
node_date_is_follow_flow, priority, remaining_count, node_date_is_follow_flow, priority, remaining_count,
repeat_count, trigger_next_time, workspace_id, repeat_count, trigger_next_time, workspace_id,
author, add_time) author, add_time, start_up
)
values (#{flowId,jdbcType=INTEGER}, #{alarmEmail,jdbcType=VARCHAR}, #{execType,jdbcType=CHAR}, values (#{flowId,jdbcType=INTEGER}, #{alarmEmail,jdbcType=VARCHAR}, #{execType,jdbcType=CHAR},
#{flowCron,jdbcType=VARCHAR}, #{flowDesc,jdbcType=VARCHAR}, #{flowName,jdbcType=VARCHAR}, #{flowCron,jdbcType=VARCHAR}, #{flowDesc,jdbcType=VARCHAR}, #{flowName,jdbcType=VARCHAR},
#{flowNodeCount,jdbcType=INTEGER}, #{flowTimeout,jdbcType=BIGINT}, #{isHaveDepend,jdbcType=CHAR}, #{flowNodeCount,jdbcType=INTEGER}, #{flowTimeout,jdbcType=BIGINT}, #{isHaveDepend,jdbcType=CHAR},
#{isInner,jdbcType=CHAR}, #{isTop,jdbcType=CHAR}, #{mailAction,jdbcType=CHAR}, #{isInner,jdbcType=CHAR}, #{isTop,jdbcType=CHAR}, #{mailAction,jdbcType=CHAR},
#{nodeDateIsFollowFlow,jdbcType=CHAR}, #{priority,jdbcType=CHAR}, #{remainingCount,jdbcType=INTEGER}, #{nodeDateIsFollowFlow,jdbcType=CHAR}, #{priority,jdbcType=CHAR}, #{remainingCount,jdbcType=INTEGER},
#{repeatCount,jdbcType=INTEGER}, #{triggerNextTime,jdbcType=BIGINT}, #{workspaceId,jdbcType=INTEGER}, #{repeatCount,jdbcType=INTEGER}, #{triggerNextTime,jdbcType=BIGINT}, #{workspaceId,jdbcType=INTEGER},
#{author,jdbcType=VARCHAR}, #{addTime,jdbcType=TIMESTAMP}) #{author,jdbcType=VARCHAR}, #{addTime,jdbcType=TIMESTAMP}, #{startUp,jdbcType=CHAR}
)
</insert> </insert>
<insert id="insertSelective" parameterType="com.byit.model.JobFlow"> <insert id="insertSelective" parameterType="com.byit.model.JobFlow">
<!-- generated @mbg.generated date: 2019-12-24 --> <!-- generated @mbg.generated date: 2019-12-24 -->
...@@ -124,6 +127,9 @@ ...@@ -124,6 +127,9 @@
<if test="addTime != null"> <if test="addTime != null">
add_time, add_time,
</if> </if>
<if test="startUp != null">
start_up,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="flowId != null"> <if test="flowId != null">
...@@ -186,6 +192,9 @@ ...@@ -186,6 +192,9 @@
<if test="addTime != null"> <if test="addTime != null">
#{addTime,jdbcType=TIMESTAMP}, #{addTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="startUp != null">
#{startUp,jdbcType=CHAR},
</if>
</trim> </trim>
</insert> </insert>
<update id="updateByIdSelective" parameterType="com.byit.model.JobFlow"> <update id="updateByIdSelective" parameterType="com.byit.model.JobFlow">
...@@ -249,6 +258,9 @@ ...@@ -249,6 +258,9 @@
<if test="addTime != null"> <if test="addTime != null">
add_time = #{addTime,jdbcType=TIMESTAMP}, add_time = #{addTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="startUp != null">
start_up = #{startUp,jdbcType=CHAR},
</if>
</set> </set>
where flow_id = #{flowId,jdbcType=INTEGER} where flow_id = #{flowId,jdbcType=INTEGER}
</update> </update>
...@@ -273,7 +285,8 @@ ...@@ -273,7 +285,8 @@
trigger_next_time = #{triggerNextTime,jdbcType=BIGINT}, trigger_next_time = #{triggerNextTime,jdbcType=BIGINT},
workspace_id = #{workspaceId,jdbcType=INTEGER}, workspace_id = #{workspaceId,jdbcType=INTEGER},
author = #{author,jdbcType=VARCHAR}, author = #{author,jdbcType=VARCHAR},
add_time = #{addTime,jdbcType=TIMESTAMP} add_time = #{addTime,jdbcType=TIMESTAMP},
start_up = #{startUp,jdbcType=CHAR}
where flow_id = #{flowId,jdbcType=INTEGER} where flow_id = #{flowId,jdbcType=INTEGER}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
...@@ -24,12 +24,14 @@ ...@@ -24,12 +24,14 @@
<result column="trigger_time" jdbcType="DATE" property="triggerTime" /> <result column="trigger_time" jdbcType="DATE" property="triggerTime" />
<result column="run_msg" jdbcType="LONGVARCHAR" property="runMsg" /> <result column="run_msg" jdbcType="LONGVARCHAR" property="runMsg" />
<result column="trigger_msg" jdbcType="LONGVARCHAR" property="triggerMsg" /> <result column="trigger_msg" jdbcType="LONGVARCHAR" property="triggerMsg" />
<result column="job_version_name" jdbcType="VARCHAR" property="jobVersionName" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
log_id, alarm_email, alarm_status, failed_remaining_count, flow_version_id, job_flow_id, log_id, alarm_email, alarm_status, failed_remaining_count, flow_version_id, job_flow_id,
job_flow_name, job_group_id, job_type, local_node_handler_name, mail_action, node_name, job_flow_name, job_group_id, job_type, local_node_handler_name, mail_action, node_name,
node_type, run_code, run_params, run_time, run_type, trigger_code, trigger_time,run_msg, trigger_msg node_type, run_code, run_params, run_time, run_type, trigger_code, trigger_time,run_msg,
trigger_msg,job_version_name
</sql> </sql>
<select id="getById" parameterType="java.lang.Integer" resultMap="BaseResultMap"> <select id="getById" parameterType="java.lang.Integer" resultMap="BaseResultMap">
...@@ -51,7 +53,7 @@ ...@@ -51,7 +53,7 @@
local_node_handler_name, mail_action, node_name, local_node_handler_name, mail_action, node_name,
node_type, run_code, run_params, node_type, run_code, run_params,
run_time, run_type, trigger_code, run_time, run_type, trigger_code,
trigger_time, run_msg, trigger_msg trigger_time, run_msg, trigger_msg,job_version_name
) )
values (#{logId,jdbcType=INTEGER}, #{alarmEmail,jdbcType=VARCHAR}, #{alarmStatus,jdbcType=CHAR}, values (#{logId,jdbcType=INTEGER}, #{alarmEmail,jdbcType=VARCHAR}, #{alarmStatus,jdbcType=CHAR},
#{failedRemainingCount,jdbcType=INTEGER}, #{flowVersionId,jdbcType=INTEGER}, #{jobFlowId,jdbcType=INTEGER}, #{failedRemainingCount,jdbcType=INTEGER}, #{flowVersionId,jdbcType=INTEGER}, #{jobFlowId,jdbcType=INTEGER},
...@@ -60,6 +62,7 @@ ...@@ -60,6 +62,7 @@
#{nodeType,jdbcType=VARCHAR}, #{runCode,jdbcType=VARCHAR}, #{runParams,jdbcType=VARCHAR}, #{nodeType,jdbcType=VARCHAR}, #{runCode,jdbcType=VARCHAR}, #{runParams,jdbcType=VARCHAR},
#{runTime,jdbcType=DATE}, #{runType,jdbcType=CHAR}, #{triggerCode,jdbcType=VARCHAR}, #{runTime,jdbcType=DATE}, #{runType,jdbcType=CHAR}, #{triggerCode,jdbcType=VARCHAR},
#{triggerTime,jdbcType=DATE}, #{runMsg,jdbcType=LONGVARCHAR}, #{triggerMsg,jdbcType=LONGVARCHAR} #{triggerTime,jdbcType=DATE}, #{runMsg,jdbcType=LONGVARCHAR}, #{triggerMsg,jdbcType=LONGVARCHAR}
,#{jobVersionName,jdbcType=VARCHAR}
) )
</insert> </insert>
...@@ -129,6 +132,9 @@ ...@@ -129,6 +132,9 @@
<if test="triggerMsg != null"> <if test="triggerMsg != null">
trigger_msg, trigger_msg,
</if> </if>
<if test="jobVersionName != null">
job_version_name,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="logId != null"> <if test="logId != null">
...@@ -194,6 +200,9 @@ ...@@ -194,6 +200,9 @@
<if test="triggerMsg != null"> <if test="triggerMsg != null">
#{triggerMsg,jdbcType=LONGVARCHAR}, #{triggerMsg,jdbcType=LONGVARCHAR},
</if> </if>
<if test="jobVersionName != null">
#{jobVersionName,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
...@@ -261,6 +270,9 @@ ...@@ -261,6 +270,9 @@
<if test="triggerMsg != null"> <if test="triggerMsg != null">
trigger_msg = #{triggerMsg,jdbcType=LONGVARCHAR}, trigger_msg = #{triggerMsg,jdbcType=LONGVARCHAR},
</if> </if>
<if test="jobVersionName != null">
jobVersionName = #{jobVersionName,jdbcType=VARCHAR},
</if>
</set> </set>
where log_id = #{logId,jdbcType=INTEGER} where log_id = #{logId,jdbcType=INTEGER}
</update> </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