Skip to content

B
byit-myth-job
Commit 6ff0a7cc by huangfusuper
Options

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

parent 25014132
Showing with 340 additions and 178 deletions
byit-myth-core/myth-admin-core/pom.xml
...@@ -61,10 +61,6 @@ ...@@ -61,10 +61,6 @@
<artifactId>spring-boot-starter-jdbc</artifactId> <artifactId>spring-boot-starter-jdbc</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
......
byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/JobFlowNodeMapper.java
...@@ -13,7 +13,7 @@ public interface JobFlowNodeMapper { ...@@ -13,7 +13,7 @@ public interface JobFlowNodeMapper {
int updateByIdSelective(JobFlowNode record); int updateByIdSelective(JobFlowNode record);
int updateByPrimaryKeyWithBLOBs(JobFlowNode record); int updateByIdWithBLOBs(JobFlowNode record);
int updateById(JobFlowNode record); int updateById(JobFlowNode record);
} }
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/JobFlowNodeVersionMapper.java
...@@ -13,7 +13,7 @@ public interface JobFlowNodeVersionMapper { ...@@ -13,7 +13,7 @@ public interface JobFlowNodeVersionMapper {
int updateByIdSelective(JobFlowNodeVersion record); int updateByIdSelective(JobFlowNodeVersion record);
int updateByPrimaryKeyWithBLOBs(JobFlowNodeVersion record); int updateByIdWithBLOBs(JobFlowNodeVersion record);
int updateById(JobFlowNodeVersion record); int updateById(JobFlowNodeVersion record);
} }
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobFlow.java
...@@ -3,6 +3,7 @@ package com.byit.model; ...@@ -3,6 +3,7 @@ package com.byit.model;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
import lombok.Data; import lombok.Data;
/** /**
...@@ -120,6 +121,18 @@ public class JobFlow implements Serializable { ...@@ -120,6 +121,18 @@ public class JobFlow implements Serializable {
private Integer workspaceId; private Integer workspaceId;
/** /**
* 创建人
*/
@ApiModelProperty("创建人")
private String author;
/**
* 创建时间
*/
@ApiModelProperty("创建时间")
private Date addTime;
/**
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobFlowNode.java
...@@ -193,6 +193,18 @@ public class JobFlowNode implements Serializable { ...@@ -193,6 +193,18 @@ public class JobFlowNode implements Serializable {
private Long triggerNextTime; private Long triggerNextTime;
/** /**
* 创建人
*/
@ApiModelProperty("创建人")
private String author;
/**
* 创建时间
*/
@ApiModelProperty("创建时间")
private Date addTime;
/**
* 源码 * 源码
*/ */
@ApiModelProperty("源码") @ApiModelProperty("源码")
......
byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobFlowNodeVersion.java
...@@ -145,9 +145,9 @@ public class JobFlowNodeVersion implements Serializable { ...@@ -145,9 +145,9 @@ public class JobFlowNodeVersion implements Serializable {
private String removeMark; private String removeMark;
/** /**
* 当前节点总共重复次数 * 当前节点总共重复次数(默认为-1，不限制)
*/ */
@ApiModelProperty("当前节点总共重复次数") @ApiModelProperty("当前节点总共重复次数(默认为-1，不限制)")
private Integer repeatCount; private Integer repeatCount;
/** /**
...@@ -205,6 +205,18 @@ public class JobFlowNodeVersion implements Serializable { ...@@ -205,6 +205,18 @@ public class JobFlowNodeVersion implements Serializable {
private String versionMark; private String versionMark;
/** /**
* 节点的作者
*/
@ApiModelProperty("节点的作者")
private String author;
/**
* 创建时间
*/
@ApiModelProperty("创建时间")
private Date addTime;
/**
* 源码 * 源码
*/ */
@ApiModelProperty("源码") @ApiModelProperty("源码")
......
byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobFlowRunRecording.java
...@@ -3,6 +3,7 @@ package com.byit.model; ...@@ -3,6 +3,7 @@ package com.byit.model;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
import lombok.Data; import lombok.Data;
/** /**
...@@ -102,6 +103,18 @@ public class JobFlowRunRecording implements Serializable { ...@@ -102,6 +103,18 @@ public class JobFlowRunRecording implements Serializable {
private Long triggerTime; private Long triggerTime;
/** /**
* 创建时间
*/
@ApiModelProperty("创建时间")
private Date addTime;
/**
* 创建人
*/
@ApiModelProperty("创建人")
private String author;
/**
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobFlowVersion.java
...@@ -121,6 +121,12 @@ public class JobFlowVersion implements Serializable { ...@@ -121,6 +121,12 @@ public class JobFlowVersion implements Serializable {
private Integer workspaceId; private Integer workspaceId;
/** /**
* 创建人
*/
@ApiModelProperty("创建人")
private String author;
/**
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobTask.java
...@@ -216,6 +216,18 @@ public class JobTask implements Serializable { ...@@ -216,6 +216,18 @@ public class JobTask implements Serializable {
private String runSource; private String runSource;
/** /**
* 创建人
*/
@ApiModelProperty("创建人")
private String author;
/**
* 创建时间
*/
@ApiModelProperty("创建时间")
private Date addTime;
/**
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobTaskSchedule.java
...@@ -223,6 +223,18 @@ public class JobTaskSchedule implements Serializable { ...@@ -223,6 +223,18 @@ public class JobTaskSchedule implements Serializable {
private String runSource; private String runSource;
/** /**
* 创建人
*/
@ApiModelProperty("创建人")
private String author;
/**
* 创建时间
*/
@ApiModelProperty("创建时间")
private Date addTime;
/**
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/resources/Generator-config.xml
...@@ -55,7 +55,11 @@ ...@@ -55,7 +55,11 @@
type="XMLMAPPER"> type="XMLMAPPER">
<property name="enableSubPackages" value="false"/> <property name="enableSubPackages" value="false"/>
</javaClientGenerator> </javaClientGenerator>
<table tableName="job_task_schedule" domainObjectName="JobTaskSchedule" /> <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>
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobFlowMapper.xml
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.byit.mapper.JobFlowMapper"> <mapper namespace="com.byit.mapper.JobFlowMapper">
<resultMap id="BaseResultMap" type="com.byit.model.JobFlow"> <resultMap id="BaseResultMap" type="com.byit.model.JobFlow">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
<id column="flow_id" jdbcType="INTEGER" property="flowId" /> <id column="flow_id" jdbcType="INTEGER" property="flowId" />
<result column="alarm_email" jdbcType="VARCHAR" property="alarmEmail" /> <result column="alarm_email" jdbcType="VARCHAR" property="alarmEmail" />
<result column="exec_type" jdbcType="CHAR" property="execType" /> <result column="exec_type" jdbcType="CHAR" property="execType" />
...@@ -21,44 +21,47 @@ ...@@ -21,44 +21,47 @@
<result column="repeat_count" jdbcType="INTEGER" property="repeatCount" /> <result column="repeat_count" jdbcType="INTEGER" property="repeatCount" />
<result column="trigger_next_time" jdbcType="BIGINT" property="triggerNextTime" /> <result column="trigger_next_time" jdbcType="BIGINT" property="triggerNextTime" />
<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="add_time" jdbcType="TIMESTAMP" property="addTime" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- 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 priority, remaining_count, repeat_count, trigger_next_time, workspace_id, author,
add_time
</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-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from job_flow_current from job_flow_current
where flow_id = #{flowId,jdbcType=INTEGER} where flow_id = #{flowId,jdbcType=INTEGER}
</select> </select>
<delete id="deleteById" parameterType="java.lang.Integer"> <delete id="deleteById" parameterType="java.lang.Integer">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
delete from job_flow_current delete from job_flow_current
where flow_id = #{flowId,jdbcType=INTEGER} where flow_id = #{flowId,jdbcType=INTEGER}
</delete> </delete>
<insert id="insert" parameterType="com.byit.model.JobFlow"> <insert id="insert" parameterType="com.byit.model.JobFlow">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
insert into job_flow_current (flow_id, alarm_email, exec_type, insert into job_flow_current (flow_id, alarm_email, exec_type,
flow_cron, flow_desc, flow_name, flow_cron, flow_desc, flow_name,
flow_node_count, flow_timeout, is_have_depend, flow_node_count, flow_timeout, is_have_depend,
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)
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})
</insert> </insert>
<insert id="insertSelective" parameterType="com.byit.model.JobFlow"> <insert id="insertSelective" parameterType="com.byit.model.JobFlow">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
insert into job_flow_current insert into job_flow_current
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="flowId != null"> <if test="flowId != null">
...@@ -115,6 +118,12 @@ ...@@ -115,6 +118,12 @@
<if test="workspaceId != null"> <if test="workspaceId != null">
workspace_id, workspace_id,
</if> </if>
<if test="author != null">
author,
</if>
<if test="addTime != null">
add_time,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="flowId != null"> <if test="flowId != null">
...@@ -171,10 +180,16 @@ ...@@ -171,10 +180,16 @@
<if test="workspaceId != null"> <if test="workspaceId != null">
#{workspaceId,jdbcType=INTEGER}, #{workspaceId,jdbcType=INTEGER},
</if> </if>
<if test="author != null">
#{author,jdbcType=VARCHAR},
</if>
<if test="addTime != null">
#{addTime,jdbcType=TIMESTAMP},
</if>
</trim> </trim>
</insert> </insert>
<update id="updateByIdSelective" parameterType="com.byit.model.JobFlow"> <update id="updateByIdSelective" parameterType="com.byit.model.JobFlow">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
update job_flow_current update job_flow_current
<set> <set>
<if test="alarmEmail != null"> <if test="alarmEmail != null">
...@@ -228,11 +243,17 @@ ...@@ -228,11 +243,17 @@
<if test="workspaceId != null"> <if test="workspaceId != null">
workspace_id = #{workspaceId,jdbcType=INTEGER}, workspace_id = #{workspaceId,jdbcType=INTEGER},
</if> </if>
<if test="author != null">
author = #{author,jdbcType=VARCHAR},
</if>
<if test="addTime != null">
add_time = #{addTime,jdbcType=TIMESTAMP},
</if>
</set> </set>
where flow_id = #{flowId,jdbcType=INTEGER} where flow_id = #{flowId,jdbcType=INTEGER}
</update> </update>
<update id="updateById" parameterType="com.byit.model.JobFlow"> <update id="updateById" parameterType="com.byit.model.JobFlow">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
update job_flow_current update job_flow_current
set alarm_email = #{alarmEmail,jdbcType=VARCHAR}, set alarm_email = #{alarmEmail,jdbcType=VARCHAR},
exec_type = #{execType,jdbcType=CHAR}, exec_type = #{execType,jdbcType=CHAR},
...@@ -250,7 +271,9 @@ ...@@ -250,7 +271,9 @@
remaining_count = #{remainingCount,jdbcType=INTEGER}, remaining_count = #{remainingCount,jdbcType=INTEGER},
repeat_count = #{repeatCount,jdbcType=INTEGER}, repeat_count = #{repeatCount,jdbcType=INTEGER},
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},
add_time = #{addTime,jdbcType=TIMESTAMP}
where flow_id = #{flowId,jdbcType=INTEGER} where flow_id = #{flowId,jdbcType=INTEGER}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobFlowNodeMapper.xml
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.byit.mapper.JobFlowNodeMapper"> <mapper namespace="com.byit.mapper.JobFlowNodeMapper">
<resultMap id="BaseResultMap" type="com.byit.model.JobFlowNode"> <resultMap id="BaseResultMap" type="com.byit.model.JobFlowNode">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
<id column="node_id" jdbcType="INTEGER" property="nodeId" /> <id column="node_id" jdbcType="INTEGER" property="nodeId" />
<result column="alarm_email" jdbcType="VARCHAR" property="alarmEmail" /> <result column="alarm_email" jdbcType="VARCHAR" property="alarmEmail" />
<result column="block_strategy" jdbcType="VARCHAR" property="blockStrategy" /> <result column="block_strategy" jdbcType="VARCHAR" property="blockStrategy" />
...@@ -33,25 +33,28 @@ ...@@ -33,25 +33,28 @@
<result column="source_principal" jdbcType="VARCHAR" property="sourcePrincipal" /> <result column="source_principal" jdbcType="VARCHAR" property="sourcePrincipal" />
<result column="source_update_time" jdbcType="DATE" property="sourceUpdateTime" /> <result column="source_update_time" jdbcType="DATE" property="sourceUpdateTime" />
<result column="trigger_next_time" jdbcType="BIGINT" property="triggerNextTime" /> <result column="trigger_next_time" jdbcType="BIGINT" property="triggerNextTime" />
<result column="author" jdbcType="VARCHAR" property="author" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
</resultMap> </resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.JobFlowNode"> <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.JobFlowNode">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
<result column="run_source" jdbcType="LONGVARCHAR" property="runSource" /> <result column="run_source" jdbcType="LONGVARCHAR" property="runSource" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
node_id, alarm_email, block_strategy, callback_token, dependency_nodes, failed_retry_count, node_id, alarm_email, block_strategy, callback_token, dependency_nodes, failed_retry_count,
flow_id, follow_task_flow, gateway_token, job_type, local_node_handler_name, mail_action, flow_id, follow_task_flow, gateway_token, job_type, local_node_handler_name, mail_action,
node_cron, node_desc, node_name, node_of_flow_id, node_timeout, node_type, plugin_urls, node_cron, node_desc, node_name, node_of_flow_id, node_timeout, node_type, plugin_urls,
priority, remaining_count, repeat_count, retry_interval, routing_strategy, run_param, priority, remaining_count, repeat_count, retry_interval, routing_strategy, run_param,
run_source_desc, script_urls, source_principal, source_update_time, trigger_next_time run_source_desc, script_urls, source_principal, source_update_time, trigger_next_time,
author, add_time
</sql> </sql>
<sql id="Blob_Column_List"> <sql id="Blob_Column_List">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
run_source run_source
</sql> </sql>
<select id="getById" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs"> <select id="getById" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
, ,
...@@ -60,12 +63,12 @@ ...@@ -60,12 +63,12 @@
where node_id = #{nodeId,jdbcType=INTEGER} where node_id = #{nodeId,jdbcType=INTEGER}
</select> </select>
<delete id="deleteById" parameterType="java.lang.Integer"> <delete id="deleteById" parameterType="java.lang.Integer">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
delete from job_flow_node_current delete from job_flow_node_current
where node_id = #{nodeId,jdbcType=INTEGER} where node_id = #{nodeId,jdbcType=INTEGER}
</delete> </delete>
<insert id="insert" parameterType="com.byit.model.JobFlowNode"> <insert id="insert" parameterType="com.byit.model.JobFlowNode">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
insert into job_flow_node_current (node_id, alarm_email, block_strategy, insert into job_flow_node_current (node_id, alarm_email, block_strategy,
callback_token, dependency_nodes, failed_retry_count, callback_token, dependency_nodes, failed_retry_count,
flow_id, follow_task_flow, gateway_token, flow_id, follow_task_flow, gateway_token,
...@@ -76,7 +79,8 @@ ...@@ -76,7 +79,8 @@
repeat_count, retry_interval, routing_strategy, repeat_count, retry_interval, routing_strategy,
run_param, run_source_desc, script_urls, run_param, run_source_desc, script_urls,
source_principal, source_update_time, trigger_next_time, source_principal, source_update_time, trigger_next_time,
run_source) author, add_time, run_source
)
values (#{nodeId,jdbcType=INTEGER}, #{alarmEmail,jdbcType=VARCHAR}, #{blockStrategy,jdbcType=VARCHAR}, values (#{nodeId,jdbcType=INTEGER}, #{alarmEmail,jdbcType=VARCHAR}, #{blockStrategy,jdbcType=VARCHAR},
#{callbackToken,jdbcType=VARCHAR}, #{dependencyNodes,jdbcType=VARCHAR}, #{failedRetryCount,jdbcType=INTEGER}, #{callbackToken,jdbcType=VARCHAR}, #{dependencyNodes,jdbcType=VARCHAR}, #{failedRetryCount,jdbcType=INTEGER},
#{flowId,jdbcType=INTEGER}, #{followTaskFlow,jdbcType=CHAR}, #{gatewayToken,jdbcType=VARCHAR}, #{flowId,jdbcType=INTEGER}, #{followTaskFlow,jdbcType=CHAR}, #{gatewayToken,jdbcType=VARCHAR},
...@@ -87,10 +91,11 @@ ...@@ -87,10 +91,11 @@
#{repeatCount,jdbcType=INTEGER}, #{retryInterval,jdbcType=BIGINT}, #{routingStrategy,jdbcType=VARCHAR}, #{repeatCount,jdbcType=INTEGER}, #{retryInterval,jdbcType=BIGINT}, #{routingStrategy,jdbcType=VARCHAR},
#{runParam,jdbcType=VARCHAR}, #{runSourceDesc,jdbcType=VARCHAR}, #{scriptUrls,jdbcType=VARCHAR}, #{runParam,jdbcType=VARCHAR}, #{runSourceDesc,jdbcType=VARCHAR}, #{scriptUrls,jdbcType=VARCHAR},
#{sourcePrincipal,jdbcType=VARCHAR}, #{sourceUpdateTime,jdbcType=DATE}, #{triggerNextTime,jdbcType=BIGINT}, #{sourcePrincipal,jdbcType=VARCHAR}, #{sourceUpdateTime,jdbcType=DATE}, #{triggerNextTime,jdbcType=BIGINT},
#{runSource,jdbcType=LONGVARCHAR}) #{author,jdbcType=VARCHAR}, #{addTime,jdbcType=TIMESTAMP}, #{runSource,jdbcType=LONGVARCHAR}
)
</insert> </insert>
<insert id="insertSelective" parameterType="com.byit.model.JobFlowNode"> <insert id="insertSelective" parameterType="com.byit.model.JobFlowNode">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
insert into job_flow_node_current insert into job_flow_node_current
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="nodeId != null"> <if test="nodeId != null">
...@@ -183,6 +188,12 @@ ...@@ -183,6 +188,12 @@
<if test="triggerNextTime != null"> <if test="triggerNextTime != null">
trigger_next_time, trigger_next_time,
</if> </if>
<if test="author != null">
author,
</if>
<if test="addTime != null">
add_time,
</if>
<if test="runSource != null"> <if test="runSource != null">
run_source, run_source,
</if> </if>
...@@ -278,13 +289,19 @@ ...@@ -278,13 +289,19 @@
<if test="triggerNextTime != null"> <if test="triggerNextTime != null">
#{triggerNextTime,jdbcType=BIGINT}, #{triggerNextTime,jdbcType=BIGINT},
</if> </if>
<if test="author != null">
#{author,jdbcType=VARCHAR},
</if>
<if test="addTime != null">
#{addTime,jdbcType=TIMESTAMP},
</if>
<if test="runSource != null"> <if test="runSource != null">
#{runSource,jdbcType=LONGVARCHAR}, #{runSource,jdbcType=LONGVARCHAR},
</if> </if>
</trim> </trim>
</insert> </insert>
<update id="updateByIdSelective" parameterType="com.byit.model.JobFlowNode"> <update id="updateByIdSelective" parameterType="com.byit.model.JobFlowNode">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
update job_flow_node_current update job_flow_node_current
<set> <set>
<if test="alarmEmail != null"> <if test="alarmEmail != null">
...@@ -374,6 +391,12 @@ ...@@ -374,6 +391,12 @@
<if test="triggerNextTime != null"> <if test="triggerNextTime != null">
trigger_next_time = #{triggerNextTime,jdbcType=BIGINT}, trigger_next_time = #{triggerNextTime,jdbcType=BIGINT},
</if> </if>
<if test="author != null">
author = #{author,jdbcType=VARCHAR},
</if>
<if test="addTime != null">
add_time = #{addTime,jdbcType=TIMESTAMP},
</if>
<if test="runSource != null"> <if test="runSource != null">
run_source = #{runSource,jdbcType=LONGVARCHAR}, run_source = #{runSource,jdbcType=LONGVARCHAR},
</if> </if>
...@@ -381,7 +404,7 @@ ...@@ -381,7 +404,7 @@
where node_id = #{nodeId,jdbcType=INTEGER} where node_id = #{nodeId,jdbcType=INTEGER}
</update> </update>
<update id="updateByPrimaryKeyWithBLOBs" parameterType="com.byit.model.JobFlowNode"> <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.byit.model.JobFlowNode">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
update job_flow_node_current update job_flow_node_current
set alarm_email = #{alarmEmail,jdbcType=VARCHAR}, set alarm_email = #{alarmEmail,jdbcType=VARCHAR},
block_strategy = #{blockStrategy,jdbcType=VARCHAR}, block_strategy = #{blockStrategy,jdbcType=VARCHAR},
...@@ -412,11 +435,13 @@ ...@@ -412,11 +435,13 @@
source_principal = #{sourcePrincipal,jdbcType=VARCHAR}, source_principal = #{sourcePrincipal,jdbcType=VARCHAR},
source_update_time = #{sourceUpdateTime,jdbcType=DATE}, source_update_time = #{sourceUpdateTime,jdbcType=DATE},
trigger_next_time = #{triggerNextTime,jdbcType=BIGINT}, trigger_next_time = #{triggerNextTime,jdbcType=BIGINT},
author = #{author,jdbcType=VARCHAR},
add_time = #{addTime,jdbcType=TIMESTAMP},
run_source = #{runSource,jdbcType=LONGVARCHAR} run_source = #{runSource,jdbcType=LONGVARCHAR}
where node_id = #{nodeId,jdbcType=INTEGER} where node_id = #{nodeId,jdbcType=INTEGER}
</update> </update>
<update id="updateById" parameterType="com.byit.model.JobFlowNode"> <update id="updateById" parameterType="com.byit.model.JobFlowNode">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
update job_flow_node_current update job_flow_node_current
set alarm_email = #{alarmEmail,jdbcType=VARCHAR}, set alarm_email = #{alarmEmail,jdbcType=VARCHAR},
block_strategy = #{blockStrategy,jdbcType=VARCHAR}, block_strategy = #{blockStrategy,jdbcType=VARCHAR},
...@@ -446,7 +471,9 @@ ...@@ -446,7 +471,9 @@
script_urls = #{scriptUrls,jdbcType=VARCHAR}, script_urls = #{scriptUrls,jdbcType=VARCHAR},
source_principal = #{sourcePrincipal,jdbcType=VARCHAR}, source_principal = #{sourcePrincipal,jdbcType=VARCHAR},
source_update_time = #{sourceUpdateTime,jdbcType=DATE}, source_update_time = #{sourceUpdateTime,jdbcType=DATE},
trigger_next_time = #{triggerNextTime,jdbcType=BIGINT} trigger_next_time = #{triggerNextTime,jdbcType=BIGINT},
author = #{author,jdbcType=VARCHAR},
add_time = #{addTime,jdbcType=TIMESTAMP}
where node_id = #{nodeId,jdbcType=INTEGER} where node_id = #{nodeId,jdbcType=INTEGER}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobFlowNodeVersionMapper.xml
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.byit.mapper.JobFlowNodeVersionMapper"> <mapper namespace="com.byit.mapper.JobFlowNodeVersionMapper">
<resultMap id="BaseResultMap" type="com.byit.model.JobFlowNodeVersion"> <resultMap id="BaseResultMap" type="com.byit.model.JobFlowNodeVersion">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
<id column="node_id" jdbcType="INTEGER" property="nodeId" /> <id column="node_id" jdbcType="INTEGER" property="nodeId" />
<result column="alarm_email" jdbcType="VARCHAR" property="alarmEmail" /> <result column="alarm_email" jdbcType="VARCHAR" property="alarmEmail" />
<result column="block_strategy" jdbcType="VARCHAR" property="blockStrategy" /> <result column="block_strategy" jdbcType="VARCHAR" property="blockStrategy" />
...@@ -35,26 +35,28 @@ ...@@ -35,26 +35,28 @@
<result column="source_update_time" jdbcType="DATE" property="sourceUpdateTime" /> <result column="source_update_time" jdbcType="DATE" property="sourceUpdateTime" />
<result column="trigger_next_time" jdbcType="BIGINT" property="triggerNextTime" /> <result column="trigger_next_time" jdbcType="BIGINT" property="triggerNextTime" />
<result column="version_mark" jdbcType="CHAR" property="versionMark" /> <result column="version_mark" jdbcType="CHAR" property="versionMark" />
<result column="author" jdbcType="VARCHAR" property="author" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
</resultMap> </resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.JobFlowNodeVersion"> <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.JobFlowNodeVersion">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
<result column="run_source" jdbcType="LONGVARCHAR" property="runSource" /> <result column="run_source" jdbcType="LONGVARCHAR" property="runSource" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
node_id, alarm_email, block_strategy, callback_token, dependency_nodes, failed_retry_count, node_id, alarm_email, block_strategy, callback_token, dependency_nodes, failed_retry_count,
flow_id, flow_version_id, follow_task_flow, gateway_token, job_type, local_node_handler_name, flow_id, flow_version_id, follow_task_flow, gateway_token, job_type, local_node_handler_name,
mail_action, node_cron, node_desc, node_name, node_of_flow_id, node_timeout, node_type, mail_action, node_cron, node_desc, node_name, node_of_flow_id, node_timeout, node_type,
plugin_urls, priority, remove_mark, repeat_count, retry_interval, routing_strategy, plugin_urls, priority, remove_mark, repeat_count, retry_interval, routing_strategy,
run_param, run_source_desc, script_urls, source_principal, source_update_time, trigger_next_time, run_param, run_source_desc, script_urls, source_principal, source_update_time, trigger_next_time,
version_mark version_mark, author, add_time
</sql> </sql>
<sql id="Blob_Column_List"> <sql id="Blob_Column_List">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
run_source run_source
</sql> </sql>
<select id="getById" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs"> <select id="getById" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
, ,
...@@ -63,12 +65,12 @@ ...@@ -63,12 +65,12 @@
where node_id = #{nodeId,jdbcType=INTEGER} where node_id = #{nodeId,jdbcType=INTEGER}
</select> </select>
<delete id="deleteById" parameterType="java.lang.Integer"> <delete id="deleteById" parameterType="java.lang.Integer">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
delete from job_flow_node_version delete from job_flow_node_version
where node_id = #{nodeId,jdbcType=INTEGER} where node_id = #{nodeId,jdbcType=INTEGER}
</delete> </delete>
<insert id="insert" parameterType="com.byit.model.JobFlowNodeVersion"> <insert id="insert" parameterType="com.byit.model.JobFlowNodeVersion">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
insert into job_flow_node_version (node_id, alarm_email, block_strategy, insert into job_flow_node_version (node_id, alarm_email, block_strategy,
callback_token, dependency_nodes, failed_retry_count, callback_token, dependency_nodes, failed_retry_count,
flow_id, flow_version_id, follow_task_flow, flow_id, flow_version_id, follow_task_flow,
...@@ -79,8 +81,8 @@ ...@@ -79,8 +81,8 @@
remove_mark, repeat_count, retry_interval, remove_mark, repeat_count, retry_interval,
routing_strategy, run_param, run_source_desc, routing_strategy, run_param, run_source_desc,
script_urls, source_principal, source_update_time, script_urls, source_principal, source_update_time,
trigger_next_time, version_mark, run_source trigger_next_time, version_mark, author,
) add_time, run_source)
values (#{nodeId,jdbcType=INTEGER}, #{alarmEmail,jdbcType=VARCHAR}, #{blockStrategy,jdbcType=VARCHAR}, values (#{nodeId,jdbcType=INTEGER}, #{alarmEmail,jdbcType=VARCHAR}, #{blockStrategy,jdbcType=VARCHAR},
#{callbackToken,jdbcType=VARCHAR}, #{dependencyNodes,jdbcType=VARCHAR}, #{failedRetryCount,jdbcType=INTEGER}, #{callbackToken,jdbcType=VARCHAR}, #{dependencyNodes,jdbcType=VARCHAR}, #{failedRetryCount,jdbcType=INTEGER},
#{flowId,jdbcType=INTEGER}, #{flowVersionId,jdbcType=INTEGER}, #{followTaskFlow,jdbcType=CHAR}, #{flowId,jdbcType=INTEGER}, #{flowVersionId,jdbcType=INTEGER}, #{followTaskFlow,jdbcType=CHAR},
...@@ -91,11 +93,11 @@ ...@@ -91,11 +93,11 @@
#{removeMark,jdbcType=CHAR}, #{repeatCount,jdbcType=INTEGER}, #{retryInterval,jdbcType=BIGINT}, #{removeMark,jdbcType=CHAR}, #{repeatCount,jdbcType=INTEGER}, #{retryInterval,jdbcType=BIGINT},
#{routingStrategy,jdbcType=VARCHAR}, #{runParam,jdbcType=VARCHAR}, #{runSourceDesc,jdbcType=VARCHAR}, #{routingStrategy,jdbcType=VARCHAR}, #{runParam,jdbcType=VARCHAR}, #{runSourceDesc,jdbcType=VARCHAR},
#{scriptUrls,jdbcType=VARCHAR}, #{sourcePrincipal,jdbcType=VARCHAR}, #{sourceUpdateTime,jdbcType=DATE}, #{scriptUrls,jdbcType=VARCHAR}, #{sourcePrincipal,jdbcType=VARCHAR}, #{sourceUpdateTime,jdbcType=DATE},
#{triggerNextTime,jdbcType=BIGINT}, #{versionMark,jdbcType=CHAR}, #{runSource,jdbcType=LONGVARCHAR} #{triggerNextTime,jdbcType=BIGINT}, #{versionMark,jdbcType=CHAR}, #{author,jdbcType=VARCHAR},
) #{addTime,jdbcType=TIMESTAMP}, #{runSource,jdbcType=LONGVARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.byit.model.JobFlowNodeVersion"> <insert id="insertSelective" parameterType="com.byit.model.JobFlowNodeVersion">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
insert into job_flow_node_version insert into job_flow_node_version
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="nodeId != null"> <if test="nodeId != null">
...@@ -194,6 +196,12 @@ ...@@ -194,6 +196,12 @@
<if test="versionMark != null"> <if test="versionMark != null">
version_mark, version_mark,
</if> </if>
<if test="author != null">
author,
</if>
<if test="addTime != null">
add_time,
</if>
<if test="runSource != null"> <if test="runSource != null">
run_source, run_source,
</if> </if>
...@@ -295,13 +303,19 @@ ...@@ -295,13 +303,19 @@
<if test="versionMark != null"> <if test="versionMark != null">
#{versionMark,jdbcType=CHAR}, #{versionMark,jdbcType=CHAR},
</if> </if>
<if test="author != null">
#{author,jdbcType=VARCHAR},
</if>
<if test="addTime != null">
#{addTime,jdbcType=TIMESTAMP},
</if>
<if test="runSource != null"> <if test="runSource != null">
#{runSource,jdbcType=LONGVARCHAR}, #{runSource,jdbcType=LONGVARCHAR},
</if> </if>
</trim> </trim>
</insert> </insert>
<update id="updateByIdSelective" parameterType="com.byit.model.JobFlowNodeVersion"> <update id="updateByIdSelective" parameterType="com.byit.model.JobFlowNodeVersion">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
update job_flow_node_version update job_flow_node_version
<set> <set>
<if test="alarmEmail != null"> <if test="alarmEmail != null">
...@@ -397,6 +411,12 @@ ...@@ -397,6 +411,12 @@
<if test="versionMark != null"> <if test="versionMark != null">
version_mark = #{versionMark,jdbcType=CHAR}, version_mark = #{versionMark,jdbcType=CHAR},
</if> </if>
<if test="author != null">
author = #{author,jdbcType=VARCHAR},
</if>
<if test="addTime != null">
add_time = #{addTime,jdbcType=TIMESTAMP},
</if>
<if test="runSource != null"> <if test="runSource != null">
run_source = #{runSource,jdbcType=LONGVARCHAR}, run_source = #{runSource,jdbcType=LONGVARCHAR},
</if> </if>
...@@ -404,7 +424,7 @@ ...@@ -404,7 +424,7 @@
where node_id = #{nodeId,jdbcType=INTEGER} where node_id = #{nodeId,jdbcType=INTEGER}
</update> </update>
<update id="updateByPrimaryKeyWithBLOBs" parameterType="com.byit.model.JobFlowNodeVersion"> <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.byit.model.JobFlowNodeVersion">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
update job_flow_node_version update job_flow_node_version
set alarm_email = #{alarmEmail,jdbcType=VARCHAR}, set alarm_email = #{alarmEmail,jdbcType=VARCHAR},
block_strategy = #{blockStrategy,jdbcType=VARCHAR}, block_strategy = #{blockStrategy,jdbcType=VARCHAR},
...@@ -437,11 +457,13 @@ ...@@ -437,11 +457,13 @@
source_update_time = #{sourceUpdateTime,jdbcType=DATE}, source_update_time = #{sourceUpdateTime,jdbcType=DATE},
trigger_next_time = #{triggerNextTime,jdbcType=BIGINT}, trigger_next_time = #{triggerNextTime,jdbcType=BIGINT},
version_mark = #{versionMark,jdbcType=CHAR}, version_mark = #{versionMark,jdbcType=CHAR},
author = #{author,jdbcType=VARCHAR},
add_time = #{addTime,jdbcType=TIMESTAMP},
run_source = #{runSource,jdbcType=LONGVARCHAR} run_source = #{runSource,jdbcType=LONGVARCHAR}
where node_id = #{nodeId,jdbcType=INTEGER} where node_id = #{nodeId,jdbcType=INTEGER}
</update> </update>
<update id="updateById" parameterType="com.byit.model.JobFlowNodeVersion"> <update id="updateById" parameterType="com.byit.model.JobFlowNodeVersion">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
update job_flow_node_version update job_flow_node_version
set alarm_email = #{alarmEmail,jdbcType=VARCHAR}, set alarm_email = #{alarmEmail,jdbcType=VARCHAR},
block_strategy = #{blockStrategy,jdbcType=VARCHAR}, block_strategy = #{blockStrategy,jdbcType=VARCHAR},
...@@ -473,7 +495,9 @@ ...@@ -473,7 +495,9 @@
source_principal = #{sourcePrincipal,jdbcType=VARCHAR}, source_principal = #{sourcePrincipal,jdbcType=VARCHAR},
source_update_time = #{sourceUpdateTime,jdbcType=DATE}, source_update_time = #{sourceUpdateTime,jdbcType=DATE},
trigger_next_time = #{triggerNextTime,jdbcType=BIGINT}, trigger_next_time = #{triggerNextTime,jdbcType=BIGINT},
version_mark = #{versionMark,jdbcType=CHAR} version_mark = #{versionMark,jdbcType=CHAR},
author = #{author,jdbcType=VARCHAR},
add_time = #{addTime,jdbcType=TIMESTAMP}
where node_id = #{nodeId,jdbcType=INTEGER} where node_id = #{nodeId,jdbcType=INTEGER}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobFlowRunRecordingMapper.xml
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.byit.mapper.JobFlowRunRecordingMapper"> <mapper namespace="com.byit.mapper.JobFlowRunRecordingMapper">
<resultMap id="BaseResultMap" type="com.byit.model.JobFlowRunRecording"> <resultMap id="BaseResultMap" type="com.byit.model.JobFlowRunRecording">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
<id column="recording_id" jdbcType="INTEGER" property="recordingId" /> <id column="recording_id" jdbcType="INTEGER" property="recordingId" />
<result column="run_id" jdbcType="VARCHAR" property="runId" /> <result column="run_id" jdbcType="VARCHAR" property="runId" />
<result column="alarm_email" jdbcType="VARCHAR" property="alarmEmail" /> <result column="alarm_email" jdbcType="VARCHAR" property="alarmEmail" />
...@@ -18,42 +18,44 @@ ...@@ -18,42 +18,44 @@
<result column="remaining_node" jdbcType="INTEGER" property="remainingNode" /> <result column="remaining_node" jdbcType="INTEGER" property="remainingNode" />
<result column="trigger_status" jdbcType="CHAR" property="triggerStatus" /> <result column="trigger_status" jdbcType="CHAR" property="triggerStatus" />
<result column="trigger_time" jdbcType="BIGINT" property="triggerTime" /> <result column="trigger_time" jdbcType="BIGINT" property="triggerTime" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="author" jdbcType="VARCHAR" property="author" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
recording_id, run_id, alarm_email, dispatch_ip, flow_name, flow_run_result, flow_status, recording_id, run_id, alarm_email, dispatch_ip, flow_name, flow_run_result, flow_status,
flow_timeout, flow_version_id, mail_action, node_count, priority, remaining_node, flow_timeout, flow_version_id, mail_action, node_count, priority, remaining_node,
trigger_status, trigger_time trigger_status, trigger_time, add_time, author
</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-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from job_flow_run_recording from job_flow_run_recording
where recording_id = #{recordingId,jdbcType=INTEGER} where recording_id = #{recordingId,jdbcType=INTEGER}
</select> </select>
<delete id="deleteById" parameterType="java.lang.Integer"> <delete id="deleteById" parameterType="java.lang.Integer">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
delete from job_flow_run_recording delete from job_flow_run_recording
where recording_id = #{recordingId,jdbcType=INTEGER} where recording_id = #{recordingId,jdbcType=INTEGER}
</delete> </delete>
<insert id="insert" parameterType="com.byit.model.JobFlowRunRecording"> <insert id="insert" parameterType="com.byit.model.JobFlowRunRecording">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
insert into job_flow_run_recording (recording_id, run_id, alarm_email, insert into job_flow_run_recording (recording_id, run_id, alarm_email,
dispatch_ip, flow_name, flow_run_result, dispatch_ip, flow_name, flow_run_result,
flow_status, flow_timeout, flow_version_id, flow_status, flow_timeout, flow_version_id,
mail_action, node_count, priority, mail_action, node_count, priority,
remaining_node, trigger_status, trigger_time remaining_node, trigger_status, trigger_time,
) add_time, author)
values (#{recordingId,jdbcType=INTEGER}, #{runId,jdbcType=VARCHAR}, #{alarmEmail,jdbcType=VARCHAR}, values (#{recordingId,jdbcType=INTEGER}, #{runId,jdbcType=VARCHAR}, #{alarmEmail,jdbcType=VARCHAR},
#{dispatchIp,jdbcType=VARCHAR}, #{flowName,jdbcType=VARCHAR}, #{flowRunResult,jdbcType=CHAR}, #{dispatchIp,jdbcType=VARCHAR}, #{flowName,jdbcType=VARCHAR}, #{flowRunResult,jdbcType=CHAR},
#{flowStatus,jdbcType=CHAR}, #{flowTimeout,jdbcType=BIGINT}, #{flowVersionId,jdbcType=INTEGER}, #{flowStatus,jdbcType=CHAR}, #{flowTimeout,jdbcType=BIGINT}, #{flowVersionId,jdbcType=INTEGER},
#{mailAction,jdbcType=CHAR}, #{nodeCount,jdbcType=INTEGER}, #{priority,jdbcType=CHAR}, #{mailAction,jdbcType=CHAR}, #{nodeCount,jdbcType=INTEGER}, #{priority,jdbcType=CHAR},
#{remainingNode,jdbcType=INTEGER}, #{triggerStatus,jdbcType=CHAR}, #{triggerTime,jdbcType=BIGINT} #{remainingNode,jdbcType=INTEGER}, #{triggerStatus,jdbcType=CHAR}, #{triggerTime,jdbcType=BIGINT},
) #{addTime,jdbcType=TIMESTAMP}, #{author,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.byit.model.JobFlowRunRecording"> <insert id="insertSelective" parameterType="com.byit.model.JobFlowRunRecording">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
insert into job_flow_run_recording insert into job_flow_run_recording
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="recordingId != null"> <if test="recordingId != null">
...@@ -101,6 +103,12 @@ ...@@ -101,6 +103,12 @@
<if test="triggerTime != null"> <if test="triggerTime != null">
trigger_time, trigger_time,
</if> </if>
<if test="addTime != null">
add_time,
</if>
<if test="author != null">
author,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="recordingId != null"> <if test="recordingId != null">
...@@ -148,10 +156,16 @@ ...@@ -148,10 +156,16 @@
<if test="triggerTime != null"> <if test="triggerTime != null">
#{triggerTime,jdbcType=BIGINT}, #{triggerTime,jdbcType=BIGINT},
</if> </if>
<if test="addTime != null">
#{addTime,jdbcType=TIMESTAMP},
</if>
<if test="author != null">
#{author,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<update id="updateByIdSelective" parameterType="com.byit.model.JobFlowRunRecording"> <update id="updateByIdSelective" parameterType="com.byit.model.JobFlowRunRecording">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
update job_flow_run_recording update job_flow_run_recording
<set> <set>
<if test="runId != null"> <if test="runId != null">
...@@ -196,11 +210,17 @@ ...@@ -196,11 +210,17 @@
<if test="triggerTime != null"> <if test="triggerTime != null">
trigger_time = #{triggerTime,jdbcType=BIGINT}, trigger_time = #{triggerTime,jdbcType=BIGINT},
</if> </if>
<if test="addTime != null">
add_time = #{addTime,jdbcType=TIMESTAMP},
</if>
<if test="author != null">
author = #{author,jdbcType=VARCHAR},
</if>
</set> </set>
where recording_id = #{recordingId,jdbcType=INTEGER} where recording_id = #{recordingId,jdbcType=INTEGER}
</update> </update>
<update id="updateById" parameterType="com.byit.model.JobFlowRunRecording"> <update id="updateById" parameterType="com.byit.model.JobFlowRunRecording">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
update job_flow_run_recording update job_flow_run_recording
set run_id = #{runId,jdbcType=VARCHAR}, set run_id = #{runId,jdbcType=VARCHAR},
alarm_email = #{alarmEmail,jdbcType=VARCHAR}, alarm_email = #{alarmEmail,jdbcType=VARCHAR},
...@@ -215,7 +235,9 @@ ...@@ -215,7 +235,9 @@
priority = #{priority,jdbcType=CHAR}, priority = #{priority,jdbcType=CHAR},
remaining_node = #{remainingNode,jdbcType=INTEGER}, remaining_node = #{remainingNode,jdbcType=INTEGER},
trigger_status = #{triggerStatus,jdbcType=CHAR}, trigger_status = #{triggerStatus,jdbcType=CHAR},
trigger_time = #{triggerTime,jdbcType=BIGINT} trigger_time = #{triggerTime,jdbcType=BIGINT},
add_time = #{addTime,jdbcType=TIMESTAMP},
author = #{author,jdbcType=VARCHAR}
where recording_id = #{recordingId,jdbcType=INTEGER} where recording_id = #{recordingId,jdbcType=INTEGER}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobFlowVersionMapper.xml
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.byit.mapper.JobFlowVersionMapper"> <mapper namespace="com.byit.mapper.JobFlowVersionMapper">
<resultMap id="BaseResultMap" type="com.byit.model.JobFlowVersion"> <resultMap id="BaseResultMap" type="com.byit.model.JobFlowVersion">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
<id column="version_id" jdbcType="INTEGER" property="versionId" /> <id column="version_id" jdbcType="INTEGER" property="versionId" />
<result column="add_time" jdbcType="DATE" property="addTime" /> <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="alarm_email" jdbcType="VARCHAR" property="alarmEmail" /> <result column="alarm_email" jdbcType="VARCHAR" property="alarmEmail" />
<result column="exec_type" jdbcType="CHAR" property="execType" /> <result column="exec_type" jdbcType="CHAR" property="execType" />
<result column="flow_cron" jdbcType="VARCHAR" property="flowCron" /> <result column="flow_cron" jdbcType="VARCHAR" property="flowCron" />
...@@ -18,47 +18,48 @@ ...@@ -18,47 +18,48 @@
<result column="priority" jdbcType="CHAR" property="priority" /> <result column="priority" jdbcType="CHAR" property="priority" />
<result column="remove_mark" jdbcType="CHAR" property="removeMark" /> <result column="remove_mark" jdbcType="CHAR" property="removeMark" />
<result column="repeat_count" jdbcType="INTEGER" property="repeatCount" /> <result column="repeat_count" jdbcType="INTEGER" property="repeatCount" />
<result column="update_time" jdbcType="DATE" property="updateTime" /> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="version_mark" jdbcType="CHAR" property="versionMark" /> <result column="version_mark" jdbcType="CHAR" property="versionMark" />
<result column="workspace_id" jdbcType="INTEGER" property="workspaceId" /> <result column="workspace_id" jdbcType="INTEGER" property="workspaceId" />
<result column="author" jdbcType="VARCHAR" property="author" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
version_id, add_time, alarm_email, exec_type, flow_cron, flow_desc, flow_id, flow_name, version_id, add_time, alarm_email, exec_type, flow_cron, flow_desc, flow_id, flow_name,
flow_node_count, flow_timeout, mail_action, node_date_is_follow_flow, priority, remove_mark, flow_node_count, flow_timeout, mail_action, node_date_is_follow_flow, priority, remove_mark,
repeat_count, update_time, version_mark, workspace_id repeat_count, update_time, version_mark, workspace_id, author
</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-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from job_flow_version from job_flow_version
where version_id = #{versionId,jdbcType=INTEGER} where version_id = #{versionId,jdbcType=INTEGER}
</select> </select>
<delete id="deleteById" parameterType="java.lang.Integer"> <delete id="deleteById" parameterType="java.lang.Integer">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
delete from job_flow_version delete from job_flow_version
where version_id = #{versionId,jdbcType=INTEGER} where version_id = #{versionId,jdbcType=INTEGER}
</delete> </delete>
<insert id="insert" parameterType="com.byit.model.JobFlowVersion"> <insert id="insert" parameterType="com.byit.model.JobFlowVersion">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
insert into job_flow_version (version_id, add_time, alarm_email, insert into job_flow_version (version_id, add_time, alarm_email,
exec_type, flow_cron, flow_desc, exec_type, flow_cron, flow_desc,
flow_id, flow_name, flow_node_count, flow_id, flow_name, flow_node_count,
flow_timeout, mail_action, node_date_is_follow_flow, flow_timeout, mail_action, node_date_is_follow_flow,
priority, remove_mark, repeat_count, priority, remove_mark, repeat_count,
update_time, version_mark, workspace_id update_time, version_mark, workspace_id,
) author)
values (#{versionId,jdbcType=INTEGER}, #{addTime,jdbcType=DATE}, #{alarmEmail,jdbcType=VARCHAR}, values (#{versionId,jdbcType=INTEGER}, #{addTime,jdbcType=TIMESTAMP}, #{alarmEmail,jdbcType=VARCHAR},
#{execType,jdbcType=CHAR}, #{flowCron,jdbcType=VARCHAR}, #{flowDesc,jdbcType=VARCHAR}, #{execType,jdbcType=CHAR}, #{flowCron,jdbcType=VARCHAR}, #{flowDesc,jdbcType=VARCHAR},
#{flowId,jdbcType=INTEGER}, #{flowName,jdbcType=VARCHAR}, #{flowNodeCount,jdbcType=INTEGER}, #{flowId,jdbcType=INTEGER}, #{flowName,jdbcType=VARCHAR}, #{flowNodeCount,jdbcType=INTEGER},
#{flowTimeout,jdbcType=BIGINT}, #{mailAction,jdbcType=CHAR}, #{nodeDateIsFollowFlow,jdbcType=CHAR}, #{flowTimeout,jdbcType=BIGINT}, #{mailAction,jdbcType=CHAR}, #{nodeDateIsFollowFlow,jdbcType=CHAR},
#{priority,jdbcType=CHAR}, #{removeMark,jdbcType=CHAR}, #{repeatCount,jdbcType=INTEGER}, #{priority,jdbcType=CHAR}, #{removeMark,jdbcType=CHAR}, #{repeatCount,jdbcType=INTEGER},
#{updateTime,jdbcType=DATE}, #{versionMark,jdbcType=CHAR}, #{workspaceId,jdbcType=INTEGER} #{updateTime,jdbcType=TIMESTAMP}, #{versionMark,jdbcType=CHAR}, #{workspaceId,jdbcType=INTEGER},
) #{author,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.byit.model.JobFlowVersion"> <insert id="insertSelective" parameterType="com.byit.model.JobFlowVersion">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
insert into job_flow_version insert into job_flow_version
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="versionId != null"> <if test="versionId != null">
...@@ -115,13 +116,16 @@ ...@@ -115,13 +116,16 @@
<if test="workspaceId != null"> <if test="workspaceId != null">
workspace_id, workspace_id,
</if> </if>
<if test="author != null">
author,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="versionId != null"> <if test="versionId != null">
#{versionId,jdbcType=INTEGER}, #{versionId,jdbcType=INTEGER},
</if> </if>
<if test="addTime != null"> <if test="addTime != null">
#{addTime,jdbcType=DATE}, #{addTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="alarmEmail != null"> <if test="alarmEmail != null">
#{alarmEmail,jdbcType=VARCHAR}, #{alarmEmail,jdbcType=VARCHAR},
...@@ -163,7 +167,7 @@ ...@@ -163,7 +167,7 @@
#{repeatCount,jdbcType=INTEGER}, #{repeatCount,jdbcType=INTEGER},
</if> </if>
<if test="updateTime != null"> <if test="updateTime != null">
#{updateTime,jdbcType=DATE}, #{updateTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="versionMark != null"> <if test="versionMark != null">
#{versionMark,jdbcType=CHAR}, #{versionMark,jdbcType=CHAR},
...@@ -171,14 +175,17 @@ ...@@ -171,14 +175,17 @@
<if test="workspaceId != null"> <if test="workspaceId != null">
#{workspaceId,jdbcType=INTEGER}, #{workspaceId,jdbcType=INTEGER},
</if> </if>
<if test="author != null">
#{author,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<update id="updateByIdSelective" parameterType="com.byit.model.JobFlowVersion"> <update id="updateByIdSelective" parameterType="com.byit.model.JobFlowVersion">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
update job_flow_version update job_flow_version
<set> <set>
<if test="addTime != null"> <if test="addTime != null">
add_time = #{addTime,jdbcType=DATE}, add_time = #{addTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="alarmEmail != null"> <if test="alarmEmail != null">
alarm_email = #{alarmEmail,jdbcType=VARCHAR}, alarm_email = #{alarmEmail,jdbcType=VARCHAR},
...@@ -220,7 +227,7 @@ ...@@ -220,7 +227,7 @@
repeat_count = #{repeatCount,jdbcType=INTEGER}, repeat_count = #{repeatCount,jdbcType=INTEGER},
</if> </if>
<if test="updateTime != null"> <if test="updateTime != null">
update_time = #{updateTime,jdbcType=DATE}, update_time = #{updateTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="versionMark != null"> <if test="versionMark != null">
version_mark = #{versionMark,jdbcType=CHAR}, version_mark = #{versionMark,jdbcType=CHAR},
...@@ -228,13 +235,16 @@ ...@@ -228,13 +235,16 @@
<if test="workspaceId != null"> <if test="workspaceId != null">
workspace_id = #{workspaceId,jdbcType=INTEGER}, workspace_id = #{workspaceId,jdbcType=INTEGER},
</if> </if>
<if test="author != null">
author = #{author,jdbcType=VARCHAR},
</if>
</set> </set>
where version_id = #{versionId,jdbcType=INTEGER} where version_id = #{versionId,jdbcType=INTEGER}
</update> </update>
<update id="updateById" parameterType="com.byit.model.JobFlowVersion"> <update id="updateById" parameterType="com.byit.model.JobFlowVersion">
<!-- generated @mbg.generated date: 2019-12-23 --> <!-- generated @mbg.generated date: 2019-12-24 -->
update job_flow_version update job_flow_version
set add_time = #{addTime,jdbcType=DATE}, set add_time = #{addTime,jdbcType=TIMESTAMP},
alarm_email = #{alarmEmail,jdbcType=VARCHAR}, alarm_email = #{alarmEmail,jdbcType=VARCHAR},
exec_type = #{execType,jdbcType=CHAR}, exec_type = #{execType,jdbcType=CHAR},
flow_cron = #{flowCron,jdbcType=VARCHAR}, flow_cron = #{flowCron,jdbcType=VARCHAR},
...@@ -248,9 +258,10 @@ ...@@ -248,9 +258,10 @@
priority = #{priority,jdbcType=CHAR}, priority = #{priority,jdbcType=CHAR},
remove_mark = #{removeMark,jdbcType=CHAR}, remove_mark = #{removeMark,jdbcType=CHAR},
repeat_count = #{repeatCount,jdbcType=INTEGER}, repeat_count = #{repeatCount,jdbcType=INTEGER},
update_time = #{updateTime,jdbcType=DATE}, update_time = #{updateTime,jdbcType=TIMESTAMP},
version_mark = #{versionMark,jdbcType=CHAR}, version_mark = #{versionMark,jdbcType=CHAR},
workspace_id = #{workspaceId,jdbcType=INTEGER} workspace_id = #{workspaceId,jdbcType=INTEGER},
author = #{author,jdbcType=VARCHAR}
where version_id = #{versionId,jdbcType=INTEGER} where version_id = #{versionId,jdbcType=INTEGER}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskMapper.xml
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
<result column="trigger_next_time" jdbcType="BIGINT" property="triggerNextTime" /> <result column="trigger_next_time" jdbcType="BIGINT" property="triggerNextTime" />
<result column="trigger_status" jdbcType="CHAR" property="triggerStatus" /> <result column="trigger_status" jdbcType="CHAR" property="triggerStatus" />
<result column="run_source" jdbcType="LONGVARCHAR" property="runSource" /> <result column="run_source" jdbcType="LONGVARCHAR" property="runSource" />
<result column="add_time" jdbcType="DATE" property="addTime" />
<result column="author" jdbcType="VARCHAR" property="author" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
...@@ -45,7 +47,7 @@ ...@@ -45,7 +47,7 @@
node_cron, node_desc, node_name, node_of_flow_id, node_timeout, node_type, plugin_urls, node_cron, node_desc, node_name, node_of_flow_id, node_timeout, node_type, plugin_urls,
priority, remaining_count, repeat_count, retry_interval, routing_strategy, run_id, priority, remaining_count, repeat_count, retry_interval, routing_strategy, run_id,
run_param, run_source_desc, script_urls, source_principal, source_update_time, trigger_next_time, run_param, run_source_desc, script_urls, source_principal, source_update_time, trigger_next_time,
trigger_status,run_source trigger_status,run_source,add_time,author
</sql> </sql>
<!--查询七秒内将要执行的数据--> <!--查询七秒内将要执行的数据-->
...@@ -89,7 +91,7 @@ ...@@ -89,7 +91,7 @@
routing_strategy, run_id, run_param, routing_strategy, run_id, run_param,
run_source_desc, script_urls, source_principal, run_source_desc, script_urls, source_principal,
source_update_time, trigger_next_time, trigger_status, source_update_time, trigger_next_time, trigger_status,
run_source) run_source,add_time,author)
values (#{id,jdbcType=INTEGER}, #{nodeId,jdbcType=INTEGER}, #{alarmEmail,jdbcType=VARCHAR}, values (#{id,jdbcType=INTEGER}, #{nodeId,jdbcType=INTEGER}, #{alarmEmail,jdbcType=VARCHAR},
#{blockStrategy,jdbcType=VARCHAR}, #{callbackToken,jdbcType=VARCHAR}, #{dependencyNodes,jdbcType=VARCHAR}, #{blockStrategy,jdbcType=VARCHAR}, #{callbackToken,jdbcType=VARCHAR}, #{dependencyNodes,jdbcType=VARCHAR},
#{failedRetryCount,jdbcType=INTEGER}, #{flowId,jdbcType=INTEGER}, #{followTaskFlow,jdbcType=CHAR}, #{failedRetryCount,jdbcType=INTEGER}, #{flowId,jdbcType=INTEGER}, #{followTaskFlow,jdbcType=CHAR},
...@@ -101,7 +103,7 @@ ...@@ -101,7 +103,7 @@
#{routingStrategy,jdbcType=VARCHAR}, #{runId,jdbcType=VARCHAR}, #{runParam,jdbcType=VARCHAR}, #{routingStrategy,jdbcType=VARCHAR}, #{runId,jdbcType=VARCHAR}, #{runParam,jdbcType=VARCHAR},
#{runSourceDesc,jdbcType=VARCHAR}, #{scriptUrls,jdbcType=VARCHAR}, #{sourcePrincipal,jdbcType=VARCHAR}, #{runSourceDesc,jdbcType=VARCHAR}, #{scriptUrls,jdbcType=VARCHAR}, #{sourcePrincipal,jdbcType=VARCHAR},
#{sourceUpdateTime,jdbcType=DATE}, #{triggerNextTime,jdbcType=BIGINT}, #{triggerStatus,jdbcType=CHAR}, #{sourceUpdateTime,jdbcType=DATE}, #{triggerNextTime,jdbcType=BIGINT}, #{triggerStatus,jdbcType=CHAR},
#{runSource,jdbcType=LONGVARCHAR}) #{runSource,jdbcType=LONGVARCHAR},#{addTime,jdbcType=DATE},#{author,jdbcType=VARCHAR})
</insert> </insert>
<!--动态数据添加--> <!--动态数据添加-->
<insert id="insertSelective" parameterType="com.byit.model.JobTask"> <insert id="insertSelective" parameterType="com.byit.model.JobTask">
...@@ -209,6 +211,12 @@ ...@@ -209,6 +211,12 @@
<if test="runSource != null"> <if test="runSource != null">
run_source, run_source,
</if> </if>
<if test="addTime != null">
add_time,
</if>
<if test="author != null">
author,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -313,6 +321,12 @@ ...@@ -313,6 +321,12 @@
<if test="runSource != null"> <if test="runSource != null">
#{runSource,jdbcType=LONGVARCHAR}, #{runSource,jdbcType=LONGVARCHAR},
</if> </if>
<if test="addTime != null">
#{addTime,jdbcType=DATE},
</if>
<if test="author != null">
#{author,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<!--动态修改--> <!--动态修改-->
...@@ -418,6 +432,12 @@ ...@@ -418,6 +432,12 @@
<if test="runSource != null"> <if test="runSource != null">
run_source = #{runSource,jdbcType=LONGVARCHAR}, run_source = #{runSource,jdbcType=LONGVARCHAR},
</if> </if>
<if test="addTime != null">
add_time = #{addTime,jdbcType=DATE},
</if>
<if test="author != null">
author = #{author,jdbcType=VARCHAR},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
......
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskScheduleMapper.xml
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
<result column="trigger_next_time" jdbcType="BIGINT" property="triggerNextTime" /> <result column="trigger_next_time" jdbcType="BIGINT" property="triggerNextTime" />
<result column="trigger_status" jdbcType="CHAR" property="triggerStatus" /> <result column="trigger_status" jdbcType="CHAR" property="triggerStatus" />
<result column="run_source" jdbcType="LONGVARCHAR" property="runSource" /> <result column="run_source" jdbcType="LONGVARCHAR" property="runSource" />
<result column="add_time" jdbcType="DATE" property="addTime" />
<result column="author" jdbcType="VARCHAR" property="author" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
...@@ -46,7 +48,7 @@ ...@@ -46,7 +48,7 @@
mail_action, node_cron, node_desc, node_name, node_of_flow_id, node_timeout, node_type, mail_action, node_cron, node_desc, node_name, node_of_flow_id, node_timeout, node_type,
plugin_urls, priority, remaining_count, repeat_count, retry_interval, routing_strategy, plugin_urls, priority, remaining_count, repeat_count, retry_interval, routing_strategy,
run_id, run_param, run_source_desc, script_urls, source_principal, source_update_time, run_id, run_param, run_source_desc, script_urls, source_principal, source_update_time,
trigger_next_time, trigger_status,run_source trigger_next_time, trigger_status,run_source,add_time,author
</sql> </sql>
<!--查询五秒内将要执行的数据--> <!--查询五秒内将要执行的数据-->
<select id="findJobTaskScheduleByTriggerNextTimeLessThanEqual" resultMap="BaseResultMap"> <select id="findJobTaskScheduleByTriggerNextTimeLessThanEqual" resultMap="BaseResultMap">
...@@ -78,7 +80,7 @@ ...@@ -78,7 +80,7 @@
retry_interval, routing_strategy, run_id, retry_interval, routing_strategy, run_id,
run_param, run_source_desc, script_urls, run_param, run_source_desc, script_urls,
source_principal, source_update_time, trigger_next_time, source_principal, source_update_time, trigger_next_time,
trigger_status, run_source) trigger_status, run_source,add_time,author)
values (#{id,jdbcType=INTEGER}, #{nodeId,jdbcType=INTEGER}, #{alarmEmail,jdbcType=VARCHAR}, values (#{id,jdbcType=INTEGER}, #{nodeId,jdbcType=INTEGER}, #{alarmEmail,jdbcType=VARCHAR},
#{blockStrategy,jdbcType=VARCHAR}, #{callbackToken,jdbcType=VARCHAR}, #{dependencyNodes,jdbcType=VARCHAR}, #{blockStrategy,jdbcType=VARCHAR}, #{callbackToken,jdbcType=VARCHAR}, #{dependencyNodes,jdbcType=VARCHAR},
#{failedRetryCount,jdbcType=INTEGER}, #{flowId,jdbcType=INTEGER}, #{followTaskFlow,jdbcType=CHAR}, #{failedRetryCount,jdbcType=INTEGER}, #{flowId,jdbcType=INTEGER}, #{followTaskFlow,jdbcType=CHAR},
...@@ -90,7 +92,7 @@ ...@@ -90,7 +92,7 @@
#{retryInterval,jdbcType=BIGINT}, #{routingStrategy,jdbcType=VARCHAR}, #{runId,jdbcType=VARCHAR}, #{retryInterval,jdbcType=BIGINT}, #{routingStrategy,jdbcType=VARCHAR}, #{runId,jdbcType=VARCHAR},
#{runParam,jdbcType=VARCHAR}, #{runSourceDesc,jdbcType=VARCHAR}, #{scriptUrls,jdbcType=VARCHAR}, #{runParam,jdbcType=VARCHAR}, #{runSourceDesc,jdbcType=VARCHAR}, #{scriptUrls,jdbcType=VARCHAR},
#{sourcePrincipal,jdbcType=VARCHAR}, #{sourceUpdateTime,jdbcType=DATE}, #{triggerNextTime,jdbcType=BIGINT}, #{sourcePrincipal,jdbcType=VARCHAR}, #{sourceUpdateTime,jdbcType=DATE}, #{triggerNextTime,jdbcType=BIGINT},
#{triggerStatus,jdbcType=CHAR}, #{runSource,jdbcType=LONGVARCHAR}) #{triggerStatus,jdbcType=CHAR}, #{runSource,jdbcType=LONGVARCHAR},#{addTime,jdbcType=DATE},#{author,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.byit.model.JobTaskSchedule"> <insert id="insertSelective" parameterType="com.byit.model.JobTaskSchedule">
insert into job_task_schedule insert into job_task_schedule
...@@ -200,6 +202,12 @@ ...@@ -200,6 +202,12 @@
<if test="runSource != null"> <if test="runSource != null">
run_source, run_source,
</if> </if>
<if test="addTime != null">
add_time,
</if>
<if test="author != null">
author,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -307,6 +315,12 @@ ...@@ -307,6 +315,12 @@
<if test="runSource != null"> <if test="runSource != null">
#{runSource,jdbcType=LONGVARCHAR}, #{runSource,jdbcType=LONGVARCHAR},
</if> </if>
<if test="addTime != null">
#{addTime,jdbcType=DATE},
</if>
<if test="author != null">
#{author,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
...@@ -323,7 +337,7 @@ ...@@ -323,7 +337,7 @@
retry_interval, routing_strategy, run_id, retry_interval, routing_strategy, run_id,
run_param, run_source_desc, script_urls, run_param, run_source_desc, script_urls,
source_principal, source_update_time, trigger_next_time, source_principal, source_update_time, trigger_next_time,
trigger_status, run_source) trigger_status,run_source,add_time,author)
values values
<foreach collection="jobTaskSchedules" item="jobTaskSchedule" separator =","> <foreach collection="jobTaskSchedules" item="jobTaskSchedule" separator =",">
(#{jobTaskSchedule.id,jdbcType=INTEGER}, #{jobTaskSchedule.nodeId,jdbcType=INTEGER}, #{jobTaskSchedule.alarmEmail,jdbcType=VARCHAR}, (#{jobTaskSchedule.id,jdbcType=INTEGER}, #{jobTaskSchedule.nodeId,jdbcType=INTEGER}, #{jobTaskSchedule.alarmEmail,jdbcType=VARCHAR},
...@@ -337,7 +351,8 @@ ...@@ -337,7 +351,8 @@
#{jobTaskSchedule.retryInterval,jdbcType=BIGINT}, #{jobTaskSchedule.routingStrategy,jdbcType=VARCHAR}, #{jobTaskSchedule.runId,jdbcType=VARCHAR}, #{jobTaskSchedule.retryInterval,jdbcType=BIGINT}, #{jobTaskSchedule.routingStrategy,jdbcType=VARCHAR}, #{jobTaskSchedule.runId,jdbcType=VARCHAR},
#{jobTaskSchedule.runParam,jdbcType=VARCHAR}, #{jobTaskSchedule.runSourceDesc,jdbcType=VARCHAR}, #{jobTaskSchedule.scriptUrls,jdbcType=VARCHAR}, #{jobTaskSchedule.runParam,jdbcType=VARCHAR}, #{jobTaskSchedule.runSourceDesc,jdbcType=VARCHAR}, #{jobTaskSchedule.scriptUrls,jdbcType=VARCHAR},
#{jobTaskSchedule.sourcePrincipal,jdbcType=VARCHAR}, #{jobTaskSchedule.sourceUpdateTime,jdbcType=DATE}, #{jobTaskSchedule.triggerNextTime,jdbcType=BIGINT}, #{jobTaskSchedule.sourcePrincipal,jdbcType=VARCHAR}, #{jobTaskSchedule.sourceUpdateTime,jdbcType=DATE}, #{jobTaskSchedule.triggerNextTime,jdbcType=BIGINT},
#{jobTaskSchedule.triggerStatus,jdbcType=CHAR}, #{jobTaskSchedule.runSource,jdbcType=LONGVARCHAR}) #{jobTaskSchedule.triggerStatus,jdbcType=CHAR}, #{jobTaskSchedule.runSource,jdbcType=LONGVARCHAR},#{jobTaskSchedule.addTime,jdbcType=DATE},
#{jobTaskSchedule.author,jdbcType=VARCHAR})
</foreach> </foreach>
</insert> </insert>
...@@ -448,84 +463,13 @@ ...@@ -448,84 +463,13 @@
<if test="runSource != null"> <if test="runSource != null">
run_source = #{runSource,jdbcType=LONGVARCHAR}, run_source = #{runSource,jdbcType=LONGVARCHAR},
</if> </if>
<if test="addTime != null">
add_time = #{addTime,jdbcType=DATE},
</if>
<if test="author != null">
author = #{author,jdbcType=VARCHAR},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<update id="updateByPrimaryKeyWithBLOBs" parameterType="com.byit.model.JobTaskSchedule">
<!-- generated @mbg.generated date: 2019-12-23 -->
update job_task_schedule
set node_id = #{nodeId,jdbcType=INTEGER},
alarm_email = #{alarmEmail,jdbcType=VARCHAR},
block_strategy = #{blockStrategy,jdbcType=VARCHAR},
callback_token = #{callbackToken,jdbcType=VARCHAR},
dependency_nodes = #{dependencyNodes,jdbcType=VARCHAR},
failed_retry_count = #{failedRetryCount,jdbcType=INTEGER},
flow_id = #{flowId,jdbcType=INTEGER},
follow_task_flow = #{followTaskFlow,jdbcType=CHAR},
gateway_token = #{gatewayToken,jdbcType=VARCHAR},
job_type = #{jobType,jdbcType=VARCHAR},
local_node_handler_name = #{localNodeHandlerName,jdbcType=VARCHAR},
log_id = #{logId,jdbcType=INTEGER},
mail_action = #{mailAction,jdbcType=CHAR},
node_cron = #{nodeCron,jdbcType=VARCHAR},
node_desc = #{nodeDesc,jdbcType=VARCHAR},
node_name = #{nodeName,jdbcType=VARCHAR},
node_of_flow_id = #{nodeOfFlowId,jdbcType=INTEGER},
node_timeout = #{nodeTimeout,jdbcType=BIGINT},
node_type = #{nodeType,jdbcType=VARCHAR},
plugin_urls = #{pluginUrls,jdbcType=VARCHAR},
priority = #{priority,jdbcType=CHAR},
remaining_count = #{remainingCount,jdbcType=INTEGER},
repeat_count = #{repeatCount,jdbcType=INTEGER},
retry_interval = #{retryInterval,jdbcType=BIGINT},
routing_strategy = #{routingStrategy,jdbcType=VARCHAR},
run_id = #{runId,jdbcType=VARCHAR},
run_param = #{runParam,jdbcType=VARCHAR},
run_source_desc = #{runSourceDesc,jdbcType=VARCHAR},
script_urls = #{scriptUrls,jdbcType=VARCHAR},
source_principal = #{sourcePrincipal,jdbcType=VARCHAR},
source_update_time = #{sourceUpdateTime,jdbcType=DATE},
trigger_next_time = #{triggerNextTime,jdbcType=BIGINT},
trigger_status = #{triggerStatus,jdbcType=CHAR},
run_source = #{runSource,jdbcType=LONGVARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateById" parameterType="com.byit.model.JobTaskSchedule">
<!-- generated @mbg.generated date: 2019-12-23 -->
update job_task_schedule
set node_id = #{nodeId,jdbcType=INTEGER},
alarm_email = #{alarmEmail,jdbcType=VARCHAR},
block_strategy = #{blockStrategy,jdbcType=VARCHAR},
callback_token = #{callbackToken,jdbcType=VARCHAR},
dependency_nodes = #{dependencyNodes,jdbcType=VARCHAR},
failed_retry_count = #{failedRetryCount,jdbcType=INTEGER},
flow_id = #{flowId,jdbcType=INTEGER},
follow_task_flow = #{followTaskFlow,jdbcType=CHAR},
gateway_token = #{gatewayToken,jdbcType=VARCHAR},
job_type = #{jobType,jdbcType=VARCHAR},
local_node_handler_name = #{localNodeHandlerName,jdbcType=VARCHAR},
log_id = #{logId,jdbcType=INTEGER},
mail_action = #{mailAction,jdbcType=CHAR},
node_cron = #{nodeCron,jdbcType=VARCHAR},
node_desc = #{nodeDesc,jdbcType=VARCHAR},
node_name = #{nodeName,jdbcType=VARCHAR},
node_of_flow_id = #{nodeOfFlowId,jdbcType=INTEGER},
node_timeout = #{nodeTimeout,jdbcType=BIGINT},
node_type = #{nodeType,jdbcType=VARCHAR},
plugin_urls = #{pluginUrls,jdbcType=VARCHAR},
priority = #{priority,jdbcType=CHAR},
remaining_count = #{remainingCount,jdbcType=INTEGER},
repeat_count = #{repeatCount,jdbcType=INTEGER},
retry_interval = #{retryInterval,jdbcType=BIGINT},
routing_strategy = #{routingStrategy,jdbcType=VARCHAR},
run_id = #{runId,jdbcType=VARCHAR},
run_param = #{runParam,jdbcType=VARCHAR},
run_source_desc = #{runSourceDesc,jdbcType=VARCHAR},
script_urls = #{scriptUrls,jdbcType=VARCHAR},
source_principal = #{sourcePrincipal,jdbcType=VARCHAR},
source_update_time = #{sourceUpdateTime,jdbcType=DATE},
trigger_next_time = #{triggerNextTime,jdbcType=BIGINT},
trigger_status = #{triggerStatus,jdbcType=CHAR}
where id = #{id,jdbcType=INTEGER}
</update>
</mapper> </mapper>
\ No newline at end of file
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