Skip to content

B
byit-myth-job
Commit eb0b51a6 by huangfusuper
Options

节点增加扩展配置项，Mapper及SQL修改

parent 64e3a3b0
Showing with 152 additions and 10 deletions
byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobTask.java
package com.byit.model;
import com.byit.dto.expand.ExtendedConfiguration;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
......@@ -225,6 +226,13 @@ public class JobTask implements Serializable {
private Integer scheduleType;
/**
* 扩展配置
* @see ExtendedConfiguration
*/
@ApiModelProperty("节点的扩展配置")
private String extendedConfiguration;
/**
*/
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
package com.byit.model;
import com.byit.dto.expand.ExtendedConfiguration;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
......@@ -210,6 +211,13 @@ public class JobTaskRunLog implements Serializable {
@ApiModelProperty("脚本路径")
private String scriptUrls;
/**
* 扩展配置
* @see ExtendedConfiguration
*/
@ApiModelProperty("节点的扩展配置")
private String extendedConfiguration;
/**
*
*/
......
byit-myth-core/myth-admin-core/src/main/java/com/byit/model/JobTaskSchedule.java
package com.byit.model;
import com.byit.dto.expand.ExtendedConfiguration;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -219,6 +220,13 @@ public class JobTaskSchedule implements Serializable {
private Integer scheduleType;
/**
* 扩展配置
* @see ExtendedConfiguration
*/
@ApiModelProperty("节点的扩展配置")
private String extendedConfiguration;
/**
*/
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/java/com/byit/model/Node.java
package com.byit.model;
import com.byit.dto.expand.ExtendedConfiguration;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -211,6 +212,14 @@ public class Node implements Serializable {
@ApiModelProperty("是否上级运行成功时运行（0 是 1 否）")
private String superSuccessRun;
/**
* 扩展配置
* @see ExtendedConfiguration
*/
@ApiModelProperty("节点的扩展配置")
private String extendedConfiguration;
/**
*/
private static final long serialVersionUID = 1L;
......
byit-myth-core/myth-admin-core/src/main/java/com/byit/model/NodeVersion.java
package com.byit.model;
import com.byit.dto.expand.ExtendedConfiguration;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -224,6 +225,13 @@ public class NodeVersion implements Serializable {
private String superSuccessRun;
/**
* 扩展配置
* @see ExtendedConfiguration
*/
@ApiModelProperty("节点的扩展配置")
private String extendedConfiguration;
/**
*/
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/java/com/byit/model/WaitingTask.java
package com.byit.model;
import com.byit.dto.expand.ExtendedConfiguration;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -209,6 +210,13 @@ public class WaitingTask implements Serializable {
private String runSource;
/**
* 扩展配置
* @see ExtendedConfiguration
*/
@ApiModelProperty("节点的扩展配置")
private String extendedConfiguration;
/**
*/
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskMapper.xml
......@@ -37,6 +37,7 @@
<result column="node_depend" jdbcType="VARCHAR" property="nodeDepend"/>
<result column="operator" jdbcType="VARCHAR" property="operator"/>
<result column="schedule_type" jdbcType="INTEGER" property="scheduleType"/>
<result column="extended_configuration" jdbcType="VARCHAR" property="extendedConfiguration"/>
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.JobTask">
<!-- generated @mbg.generated date: 2019-12-25 -->
......@@ -48,7 +49,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, node_depend, operator, schedule_type
run_command,flow_name, super_success_run, re_run_id,log_id, node_depend, operator, schedule_type, extended_configuration
</sql>
<sql id="Blob_Column_List">
run_source
......@@ -200,6 +201,11 @@
<if test="scheduleType != null">
schedule_type,
</if>
<if test="extendedConfiguration != null">
extended_configuration,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -307,6 +313,10 @@
<if test="scheduleType != null">
#{scheduleType,jdbcType=INTEGER},
</if>
<if test="extendedConfiguration != null">
#{extendedConfiguration,jdbcType=VARCHAR},
</if>
</trim>
</insert>
......@@ -316,7 +326,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, node_depend, operator, schedule_type
run_command,run_source,flow_name,super_success_run, re_run_id ,log_id, node_depend, operator, schedule_type, extended_configuration
) values
<foreach collection="jobTasks" item="jobTask" separator =",">
(
......@@ -329,7 +339,8 @@
#{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.nodeDepend,jdbcType=VARCHAR},#{jobTask.operator,jdbcType=VARCHAR}, #{jobTask.scheduleType,jdbcType=INTEGER}
#{jobTask.logId,jdbcType=INTEGER},#{jobTask.nodeDepend,jdbcType=VARCHAR},#{jobTask.operator,jdbcType=VARCHAR},
#{jobTask.scheduleType,jdbcType=INTEGER}, #{extendedConfiguration,jdbcType=VARCHAR}
)
</foreach>
</insert>
......@@ -440,6 +451,9 @@
<if test="scheduleType != null">
schedule_type = #{scheduleType,jdbcType=INTEGER},
</if>
<if test="extendedConfiguration != null">
extended_configuration = #{extendedConfiguration,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskRunLogMapper.xml
......@@ -34,6 +34,7 @@
<result column="operator" jdbcType="VARCHAR" property="operator"/>
<result column="schedule_type" jdbcType="INTEGER" property="scheduleType"/>
<result column="script_urls" jdbcType="VARCHAR" property="scriptUrls"/>
<result column="extended_configuration" jdbcType="VARCHAR" property="extendedConfiguration"/>
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.JobTaskRunLogWithBLOBs">
<result column="run_msg" jdbcType="LONGVARCHAR" property="runMsg" />
......@@ -43,7 +44,8 @@
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, node_depend, operator, schedule_type,script_urls
,log_file_name, super_success_run, run_count, log_remotely_path, node_depend, operator,
schedule_type,script_urls, extended_configuration
</sql>
<sql id="Blob_Column_List">
run_msg, trigger_msg
......@@ -358,6 +360,10 @@
<if test="scriptUrls != null">
script_urls,
</if>
<if test="extendedConfiguration != null">
extended_configuration,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="logId != null">
......@@ -462,6 +468,10 @@
<if test="scriptUrls != null">
#{scriptUrls,jdbcType=VARCHAR},
</if>
<if test="extendedConfiguration != null">
#{extendedConfiguration,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<update id="updateJobTaskRunLogWithBLOBs" parameterType="com.byit.model.JobTaskRunLogWithBLOBs">
......@@ -566,6 +576,9 @@
<if test="scriptUrls != null">
script_urls = #{scriptUrls,jdbcType=VARCHAR},
</if>
<if test="extendedConfiguration != null">
extended_configuration = #{extendedConfiguration,jdbcType=VARCHAR},
</if>
</set>
where log_id = #{logId,jdbcType=INTEGER}
</update>
......@@ -665,6 +678,9 @@
<if test="scriptUrls != null">
script_urls = #{scriptUrls,jdbcType=VARCHAR},
</if>
<if test="extendedConfiguration != null">
extended_configuration = #{extendedConfiguration,jdbcType=VARCHAR},
</if>
</set>
where log_id = #{logId,jdbcType=INTEGER}
</update>
......
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskScheduleMapper.xml
......@@ -37,6 +37,7 @@
<result column="node_depend" jdbcType="VARCHAR" property="nodeDepend"/>
<result column="operator" jdbcType="VARCHAR" property="operator"/>
<result column="schedule_type" jdbcType="INTEGER" property="scheduleType"/>
<result column="extended_configuration" jdbcType="VARCHAR" property="extendedConfiguration"/>
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.JobTaskSchedule">
......@@ -48,7 +49,8 @@
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, node_depend, operator, schedule_type
log_id, run_command,flow_name, super_success_run, re_run_id, node_depend, operator,
schedule_type, extended_configuration
</sql>
<sql id="Blob_Column_List">
run_source
......@@ -186,6 +188,10 @@
<if test="scheduleType != null">
schedule_type,
</if>
<if test="extendedConfiguration != null">
extended_configuration,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -293,6 +299,10 @@
<if test="scheduleType != null">
#{scheduleType,jdbcType=INTEGER},
</if>
<if test="extendedConfiguration != null">
#{extendedConfiguration,jdbcType=VARCHAR},
</if>
</trim>
</insert>
......@@ -307,7 +317,7 @@
script_urls, source_principal, trigger_time,
trigger_status, version_name, log_id,
run_command, run_source,flow_name, super_success_run, re_run_id,
node_depend, operator, schedule_type
node_depend, operator, schedule_type, extended_configuration
)
values
<foreach collection="jobTaskSchedules" item="jobTaskSchedule" separator=",">
......@@ -333,7 +343,8 @@
#{jobTaskSchedule.runCommand,jdbcType=VARCHAR}, #{jobTaskSchedule.runSource,jdbcType=LONGVARCHAR},
#{jobTaskSchedule.flowName,jdbcType=VARCHAR}, #{jobTaskSchedule.superSuccessRun,jdbcType=CHAR},
#{jobTaskSchedule.reRunId,jdbcType=VARCHAR}, #{jobTaskSchedule.nodeDepend,jdbcType=VARCHAR},
#{jobTaskSchedule.operator,jdbcType=VARCHAR}, #{jobTaskSchedule.scheduleType,jdbcType=INTEGER}
#{jobTaskSchedule.operator,jdbcType=VARCHAR}, #{jobTaskSchedule.scheduleType,jdbcType=INTEGER},
#{extendedConfiguration,jdbcType=VARCHAR}
)
</foreach>
</insert>
......@@ -444,6 +455,9 @@
<if test="scheduleType != null">
schedule_type = #{scheduleType,jdbcType=INTEGER},
</if>
<if test="extendedConfiguration != null">
extended_configuration = #{extendedConfiguration,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......
byit-myth-core/myth-admin-core/src/main/resources/mapper/NodeMapper.xml
......@@ -35,6 +35,7 @@
<result column="on_fork" jdbcType="CHAR" property="onFork" />
<result column="run_command" jdbcType="VARCHAR" property="runCommand" />
<result column="super_success_run" jdbcType="CHAR" property="superSuccessRun"/>
<result column="extended_configuration" jdbcType="VARCHAR" property="extendedConfiguration"/>
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.Node">
<!-- generated @mbg.generated date: 2019-12-31 -->
......@@ -46,7 +47,8 @@
job_type, handler_name, node_cron, node_desc, node_name, map_flow_id, node_timeout,
is_virtual, plugin_urls, priority, remaining_count, repeat_count, failed_retry_interval,
routing_strategy, run_param, run_source_desc, script_urls, source_principal, source_update_time,
trigger_next_time, author, add_time, version_name, on_fork, run_command, super_success_run
trigger_next_time, author, add_time, version_name, on_fork, run_command,
super_success_run, extended_configuration
</sql>
<sql id="Blob_Column_List">
......@@ -279,6 +281,9 @@
<if test="superSuccessRun != null">
super_success_run,
</if>
<if test="extendedConfiguration != null">
extended_configuration,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="nodeId != null">
......@@ -380,6 +385,9 @@
<if test="superSuccessRun != null">
#{superSuccessRun,jdbcType=CHAR},
</if>
<if test="extendedConfiguration != null">
#{extendedConfiguration,jdbcType=VARCHAR},
</if>
</trim>
</insert>
......@@ -492,6 +500,10 @@
<if test="superSuccessRun != null">
super_success_run = #{superSuccessRun,jdbcType=CHAR},
</if>
<if test="extendedConfiguration != null">
extended_configuration = #{extendedConfiguration,jdbcType=VARCHAR},
</if>
</set>
where node_id = #{nodeId,jdbcType=INTEGER}
</update>
......
byit-myth-core/myth-admin-core/src/main/resources/mapper/NodeVersionMapper.xml
......@@ -37,6 +37,7 @@
<result column="on_fork" jdbcType="CHAR" property="onFork" />
<result column="run_command" jdbcType="VARCHAR" property="runCommand" />
<result column="super_success_run" jdbcType="CHAR" property="superSuccessRun"/>
<result column="extended_configuration" jdbcType="VARCHAR" property="extendedConfiguration"/>
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.NodeVersion">
<!-- generated @mbg.generated date: 2019-12-31 -->
......@@ -49,7 +50,7 @@
map_flow_id, node_timeout, is_virtual, plugin_urls, priority, remove_mark, repeat_count,
failed_retry_interval, routing_strategy, run_param, run_source_desc, script_urls,
source_principal, source_update_time, version_mark, author, add_time, version_name,
on_fork, run_command, super_success_run
on_fork, run_command, super_success_run, extended_configuration
</sql>
<sql id="Blob_Column_List">
<!-- generated @mbg.generated date: 2019-12-31 -->
......@@ -211,6 +212,9 @@
<if test="superSuccessRun != null">
super_success_run,
</if>
<if test="extendedConfiguration != null">
extended_configuration,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="nodeVersionId != null">
......@@ -318,6 +322,9 @@
<if test="superSuccessRun != null">
#{superSuccessRun,jdbcType=CHAR},
</if>
<if test="extendedConfiguration != null">
#{extendedConfiguration,jdbcType=VARCHAR},
</if>
</trim>
</insert>
......@@ -433,6 +440,10 @@
<if test="superSuccessRun != null">
super_success_run = #{superSuccessRun,jdbcType=CHAR},
</if>
<if test="extendedConfiguration != null">
extended_configuration = #{extendedConfiguration,jdbcType=VARCHAR},
</if>
</set>
where node_version_id = #{nodeVersionId,jdbcType=INTEGER}
</update>
......
byit-myth-core/myth-admin-core/src/main/resources/mapper/WaitingTaskMapper.xml
......@@ -35,6 +35,8 @@
<result column="node_depend" jdbcType="VARCHAR" property="nodeDepend" />
<result column="operator" jdbcType="VARCHAR" property="operator" />
<result column="schedule_type" jdbcType="INTEGER" property="scheduleType" />
<result column="extended_configuration" jdbcType="VARCHAR" property="extendedConfiguration"/>
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.WaitingTask">
<!-- generated @mbg.generated date: 2020-03-12 -->
......@@ -46,7 +48,8 @@
flow_id, version_name, plugin_token, gateway_token, map_flow_id, is_virtual, plugin_urls,
priority, failed_retry_count, failed_retry_interval, block_strategy, routing_strategy,
run_param, run_source_desc, run_command, script_urls, source_principal, trigger_time,
flow_name, super_success_run, re_run_id, node_depend, `operator`, schedule_type
flow_name, super_success_run, re_run_id, node_depend, `operator`,
schedule_type, extended_configuration
</sql>
<sql id="Blob_Column_List">
<!-- generated @mbg.generated date: 2020-03-12 -->
......@@ -201,6 +204,9 @@
<if test="runSource != null">
run_source,
</if>
<if test="extendedConfiguration != null">
extended_configuration,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -302,6 +308,9 @@
<if test="runSource != null">
#{runSource,jdbcType=LONGVARCHAR},
</if>
<if test="extendedConfiguration != null">
#{extendedConfiguration,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<update id="updateByIdSelective" parameterType="com.byit.model.WaitingTask">
......@@ -404,6 +413,9 @@
<if test="runSource != null">
run_source = #{runSource,jdbcType=LONGVARCHAR},
</if>
<if test="extendedConfiguration != null">
extended_configuration = #{extendedConfiguration,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......
byit-myth-core/myth-dto-core/src/main/java/com/byit/dto/expand/ExtendedConfiguration.java 0 → 100644
package com.byit.dto.expand;
/**
* 扩展配置
*
* @author huangfu
* @date 2020年10月20日15:11:12
*/
public class ExtendedConfiguration {
}
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