Skip to content

B
byit-myth-job
Commit 232c3720 by huangfusuper
Options

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

parents 6f207ab7 7be3e6f5
Showing with 155 additions and 11 deletions
byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobTask.java
......@@ -207,6 +207,18 @@ public class JobTask implements Serializable {
private Integer logId;
/**
* 依赖节点id集合
*/
@ApiModelProperty("依赖节点id集合")
private String nodeDepend;
/**
* 重跑和补批的操作人
*/
@ApiModelProperty("重跑和补批的操作人")
private String operator;
/**
*/
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
......@@ -184,6 +184,18 @@ public class JobTaskRunLog implements Serializable {
*/
@ApiModelProperty("日志的远程路径")
private String logRemotelyPath;
/**
* 依赖节点id集合
*/
@ApiModelProperty("依赖节点id集合")
private String nodeDepend;
/**
* 重跑和补批的操作人
*/
@ApiModelProperty("重跑和补批的操作人")
private String operator;
/**
*
*/
......
byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobTaskSchedule.java
......@@ -201,6 +201,18 @@ public class JobTaskSchedule implements Serializable {
private String reRunId;
/**
* 依赖节点id集合
*/
@ApiModelProperty("依赖节点id集合")
private String nodeDepend;
/**
* 重跑和补批的操作人
*/
@ApiModelProperty("重跑和补批的操作人")
private String operator;
/**
*/
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/java/com/byit/model/RunRecording.java
......@@ -2,14 +2,14 @@ package com.byit.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
*
*/
......@@ -138,6 +138,18 @@ public class RunRecording implements Serializable {
@ApiModelProperty("工作流节点数量")
private Integer flowNodeCount;
/**
* 跑批类型 1 正常跑批 2 重跑 3 补批
*/
@ApiModelProperty("跑批类型 1 正常跑批 2 重跑 3 补批")
private String runType;
/**
* 重跑和补批的操作人
*/
@ApiModelProperty("重跑和补批的操作人")
private String operator;
/**
*/
......
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskMapper.xml
......@@ -34,6 +34,8 @@
<result column="super_success_run" jdbcType="CHAR" property="superSuccessRun"/>
<result column="re_run_id" jdbcType="VARCHAR" property="reRunId"/>
<result column="log_id" jdbcType="INTEGER" property="logId"/>
<result column="node_depend" jdbcType="VARCHAR" property="nodeDepend"/>
<result column="operator" jdbcType="VARCHAR" property="operator"/>
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.JobTask">
<!-- generated @mbg.generated date: 2019-12-25 -->
......@@ -45,7 +47,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, super_success_run, re_run_id,log_id
run_command,flow_name, super_success_run, re_run_id,log_id, node_depend, operator
</sql>
<sql id="Blob_Column_List">
run_source
......@@ -170,6 +172,12 @@
<if test="logId != null">
log_id,
</if>
<if test="nodeDepend != null">
node_depend,
</if>
<if test="operator != null">
operator,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -268,6 +276,12 @@
<if test="logId != null">
#{logId,jdbcType=INTEGER},
</if>
<if test="nodeDepend != null">
#{nodeDepend,jdbcType=VARCHAR},
</if>
<if test="operator != null">
#{operator,jdbcType=VARCHAR},
</if>
</trim>
</insert>
......@@ -277,7 +291,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,super_success_run, re_run_id ,log_id
run_command,run_source,flow_name,super_success_run, re_run_id ,log_id, node_depend, operator
) values
<foreach collection="jobTasks" item="jobTask" separator =",">
(
......@@ -290,7 +304,7 @@
#{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.superSuccessRun,jdbcType=CHAR},#{jobTask.reRunId,jdbcType=VARCHAR},
#{jobTask.logId,jdbcType=INTEGER}
#{jobTask.logId,jdbcType=INTEGER},#{jobTask.nodeDepend,jdbcType=VARCHAR},#{jobTask.operator,jdbcType=VARCHAR}
)
</foreach>
......@@ -393,6 +407,12 @@
<if test="logId != null">
logId = #{logId,jdbcType=INTEGER},
</if>
<if test="nodeDepend != null">
node_depend = #{nodeDepend,jdbcType=VARCHAR},
</if>
<if test="operator != null">
operator = #{operator,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskRunLogMapper.xml
......@@ -30,6 +30,8 @@
<result column="super_success_run" jdbcType="CHAR" property="superSuccessRun"/>
<result column="run_count" jdbcType="INTEGER" property="runCount"/>
<result column="log_remotely_path" jdbcType="VARCHAR" property="logRemotelyPath"/>
<result column="node_depend" jdbcType="VARCHAR" property="nodeDepend"/>
<result column="operator" jdbcType="VARCHAR" property="operator"/>
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.JobTaskRunLogWithBLOBs">
<result column="run_msg" jdbcType="LONGVARCHAR" property="runMsg" />
......@@ -39,7 +41,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, super_success_run, run_count, log_remotely_path
,log_file_name, super_success_run, run_count, log_remotely_path, node_depend, operator
</sql>
<sql id="Blob_Column_List">
run_msg, trigger_msg
......@@ -217,6 +219,12 @@
<if test="logRemotelyPath != null">
log_remotely_path,
</if>
<if test="nodeDepend != null">
node_depend,
</if>
<if test="operator != null">
operator,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="logId != null">
......@@ -309,6 +317,12 @@
<if test="logRemotelyPath != null">
#{logRemotelyPath,jdbcType=VARCHAR},
</if>
<if test="nodeDepend != null">
#{nodeDepend,jdbcType=VARCHAR},
</if>
<if test="operator != null">
#{operator,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<update id="updateJobTaskRunLogWithBLOBs" parameterType="com.byit.model.JobTaskRunLogWithBLOBs">
......@@ -401,6 +415,12 @@
<if test="logRemotelyPath != null">
log_remotely_path = #{logRemotelyPath,jdbcType=VARCHAR},
</if>
<if test="nodeDepend != null">
node_depend = #{nodeDepend,jdbcType=VARCHAR},
</if>
<if test="operator != null">
operator = #{operator,jdbcType=VARCHAR},
</if>
</set>
where log_id = #{logId,jdbcType=INTEGER}
</update>
......@@ -488,6 +508,12 @@
<if test="logRemotelyPath != null">
log_remotely_path = #{logRemotelyPath,jdbcType=VARCHAR},
</if>
<if test="nodeDepend != null">
node_depend = #{nodeDepend,jdbcType=VARCHAR},
</if>
<if test="operator != null">
operator = #{operator,jdbcType=VARCHAR},
</if>
</set>
where log_id = #{logId,jdbcType=INTEGER}
</update>
......
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskScheduleMapper.xml
......@@ -34,6 +34,8 @@
<result column="flow_name" jdbcType="VARCHAR" property="flowName"/>
<result column="super_success_run" jdbcType="CHAR" property="superSuccessRun"/>
<result column="re_run_id" jdbcType="VARCHAR" property="reRunId"/>
<result column="node_depend" jdbcType="VARCHAR" property="nodeDepend"/>
<result column="operator" jdbcType="VARCHAR" property="operator"/>
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.JobTaskSchedule">
......@@ -45,7 +47,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, super_success_run, re_run_id
log_id, run_command,flow_name, super_success_run, re_run_id, node_depend, operator
</sql>
<sql id="Blob_Column_List">
run_source
......@@ -174,6 +176,12 @@
<if test="reRunId != null">
re_run_id,
</if>
<if test="nodeDepend != null">
node_depend,
</if>
<if test="operator != null">
operator,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -272,6 +280,12 @@
<if test="reRunId != null">
#{reRunId,jdbcType=VARCHAR},
</if>
<if test="nodeDepend != null">
#{nodeDepend,jdbcType=VARCHAR},
</if>
<if test="operator != null">
#{operator,jdbcType=VARCHAR},
</if>
</trim>
</insert>
......@@ -285,7 +299,8 @@
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, super_success_run, re_run_id
run_command, run_source,flow_name, super_success_run, re_run_id,
node_depend, operator
)
values
<foreach collection="jobTaskSchedules" item="jobTaskSchedule" separator=",">
......@@ -310,7 +325,8 @@
#{jobTaskSchedule.logId,jdbcType=INTEGER},
#{jobTaskSchedule.runCommand,jdbcType=VARCHAR}, #{jobTaskSchedule.runSource,jdbcType=LONGVARCHAR},
#{jobTaskSchedule.flowName,jdbcType=VARCHAR}, #{jobTaskSchedule.superSuccessRun,jdbcType=CHAR},
#{jobTaskSchedule.reRunId,jdbcType=VARCHAR}
#{jobTaskSchedule.reRunId,jdbcType=VARCHAR}, #{jobTaskSchedule.nodeDepend,jdbcType=VARCHAR},
#{jobTaskSchedule.operator,jdbcType=VARCHAR}
)
</foreach>
</insert>
......@@ -412,6 +428,12 @@
<if test="reRunId != null">
re_run_id = #{reRunId,jdbcType=VARCHAR},
</if>
<if test="nodeDepend != null">
node_depend = #{nodeDepend,jdbcType=VARCHAR},
</if>
<if test="operator != null">
operator = #{operator,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......
byit-myth-core/myth-admin-core/src/main/resources/mapper/RunRecordingMapper.xml
......@@ -22,11 +22,13 @@
<result column="is_inner" jdbcType="CHAR" property="isInner" />
<result column="fail_fast" jdbcType="CHAR" property="failFast" />
<result column="flow_node_count" jdbcType="VARCHAR" property="flowNodeCount" />
<result column="run_type" jdbcType="INTEGER" property="runType" />
<result column="operator" jdbcType="VARCHAR" property="operator" />
</resultMap>
<sql id="Base_Column_List">
recording_id, run_id, alarm_email, dispatch_ip, flow_name, flow_run_result, flow_status,
flow_timeout, flow_version_name, alarml_action, priority, trigger_time, principal,
flow_id, start_time, end_time, is_alarm,is_inner,fail_fast, flow_node_count
flow_id, start_time, end_time, is_alarm,is_inner,fail_fast, flow_node_count, run_type, operator
</sql>
<!--查询已完结 没有告警的-->
......@@ -187,6 +189,12 @@
<if test="flowNodeCount != null">
flow_node_count,
</if>
<if test="runType != null">
run_type,
</if>
<if test="operator != null">
operator,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="recordingId != null">
......@@ -249,6 +257,12 @@
<if test="flowNodeCount != null">
#{flowNodeCount,jdbcType=INTEGER},
</if>
<if test="runType != null">
#{runType,jdbcType=INTEGER},
</if>
<if test="operator != null">
#{operator,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<update id="updateRunRecordingById" parameterType="com.byit.model.RunRecording">
......@@ -311,6 +325,12 @@
<if test="flowNodeCount != null">
flow_node_count = #{flowNodeCount,jdbcType=INTEGER},
</if>
<if test="runType != null">
run_type = #{runType,jdbcType=INTEGER},
</if>
<if test="operator != null">
operator = #{operator,jdbcType=VARCHAR},
</if>
</set>
where recording_id = #{recordingId,jdbcType=INTEGER}
</update>
......@@ -375,6 +395,12 @@
<if test="flowNodeCount != null">
flow_node_count = #{flowNodeCount,jdbcType=INTEGER},
</if>
<if test="runType != null">
run_type = #{runType,jdbcType=INTEGER},
</if>
<if test="operator != null">
operator = #{operator,jdbcType=VARCHAR},
</if>
</set>
where flow_id = #{flowId,jdbcType=INTEGER} and run_id = #{runId,jdbcType=VARCHAR}
</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