Skip to content

B
byit-myth-job
Commit 1c9ec763 by guo_minglei@163.com
Options

补批代码修改

parent 9f31706a
Showing with 57 additions and 143 deletions
byit-myth-admin/src/main/java/com/byit/service/impl/ApiFlowServiceImpl.java
......@@ -751,10 +751,19 @@ public class ApiFlowServiceImpl implements ApiFlowService {
Flow flow = flowMapper.getByWorkSpaceAndName(workspace.getWorkspaceId(), flowName);
ValidationUtil.dataNotNull(flow, flowName + "工作流不存在");
List<Node> nodeList = nodeMapper.findByFlowIdAndName(flow.getFlowId(), nodeNameList);
//校验是否存在未运行结束的工作流实例
List<RunRecording> unFinishList = runRecordingMapper.findUnFinishByFlowId(flow.getFlowId());
}
private Map<String, List<WaitingTask>> buildTask(List<Node> nodeList, List<String> nodeNameList, List<String> repairTimeList){
List<WaitingTask> waitingTaskList = new ArrayList<>();
nodeList.forEach(node -> {
List<String> dependList = nodeDependencyMapper.findNodeInfoByNodeId(node.getNodeId());
});
//校验时间
for (String repairTime : repairTimeList){
try {
......@@ -769,12 +778,6 @@ public class ApiFlowServiceImpl implements ApiFlowService {
}
}
private List<WaitingTask> buildTask(List<Node> nodeList, String repairTimeList){
return null;
}
......
byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/NodeDependencyMapper.java
package com.byit.mapper;
import com.byit.model.Node;
import com.byit.model.NodeDependencyKey;
import org.apache.ibatis.annotations.Param;
......@@ -34,4 +35,6 @@ public interface NodeDependencyMapper {
* @return
*/
List<Integer> findSubNodeList(Integer nodeId);
List<String> findNodeInfoByNodeId(Integer nodeId);
}
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/WaitingRecordMapper.java
......@@ -5,13 +5,10 @@ import com.byit.model.WaitingRecord;
public interface WaitingRecordMapper {
int deleteById(Integer waitId);
int insert(WaitingRecord record);
int insertSelective(WaitingRecord record);
WaitingRecord getById(Integer waitId);
int updateByIdSelective(WaitingRecord record);
int updateById(WaitingRecord record);
}
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/java/com/byit/mapper/WaitingTaskMapper.java
......@@ -5,15 +5,12 @@ import com.byit.model.WaitingTask;
public interface WaitingTaskMapper {
int deleteById(Integer id);
int insert(WaitingTask record);
int insertSelective(WaitingTask record);
WaitingTask getById(Integer id);
int updateByIdSelective(WaitingTask record);
int updateByIdWithBLOBs(WaitingTask record);
int updateByPrimaryKeyWithBLOBs(WaitingTask record);
int updateById(WaitingTask record);
}
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/java/com/byit/model/WaitingTask.java
......@@ -20,7 +20,7 @@ public class WaitingTask implements Serializable {
* 运行标识
*/
@ApiModelProperty("运行标识")
private String runId;
private String waitId;
/**
* 当前版本节点主键
......
byit-myth-core/myth-admin-core/src/main/resources/mapper/NodeDependencyMapper.xml
......@@ -25,7 +25,13 @@
where dependency_id = #{nodeId,jdbcType=INTEGER}
</select>
<delete id="deleteById" parameterType="com.byit.model.NodeDependencyKey">
<select id="findNodeInfoByNodeId" resultType="string">
select
from node_dependency depend
left join node i
</select>
<delete id="deleteById" parameterType="com.byit.model.NodeDependencyKey">
<!-- generated @mbg.generated date: 2019-12-31 -->
delete from node_dependency
where node_id = #{nodeId,jdbcType=INTEGER}
......
byit-myth-core/myth-admin-core/src/main/resources/mapper/WaitingRecordMapper.xml
......@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.byit.mapper.WaitingRecordMapper">
<resultMap id="BaseResultMap" type="com.byit.model.WaitingRecord">
<!-- generated @mbg.generated date: 2020-03-11 -->
<!-- generated @mbg.generated date: 2020-03-12 -->
<id column="wait_id" jdbcType="INTEGER" property="waitId" />
<result column="flow_id" jdbcType="INTEGER" property="flowId" />
<result column="flow_name" jdbcType="VARCHAR" property="flowName" />
......@@ -21,40 +21,26 @@
<result column="run_id" jdbcType="VARCHAR" property="runId" />
</resultMap>
<sql id="Base_Column_List">
<!-- generated @mbg.generated date: 2020-03-11 -->
<!-- generated @mbg.generated date: 2020-03-12 -->
wait_id, flow_id, flow_name, flow_version_name, flow_timeout, alarm_email, alarml_action,
priority, trigger_time, principal, is_inner, flow_node_count, schedule_type, `operator`,
wait_order, run_id
</sql>
<select id="getById" parameterType="java.lang.Integer" resultMap="BaseResultMap">
<!-- generated @mbg.generated date: 2020-03-11 -->
<!-- generated @mbg.generated date: 2020-03-12 -->
select
<include refid="Base_Column_List" />
from waiting_record
where wait_id = #{waitId,jdbcType=INTEGER}
</select>
<delete id="deleteById" parameterType="java.lang.Integer">
<!-- generated @mbg.generated date: 2020-03-11 -->
<!-- generated @mbg.generated date: 2020-03-12 -->
delete from waiting_record
where wait_id = #{waitId,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.byit.model.WaitingRecord">
<!-- generated @mbg.generated date: 2020-03-11 -->
insert into waiting_record (wait_id, flow_id, flow_name,
flow_version_name, flow_timeout, alarm_email,
alarml_action, priority, trigger_time,
principal, is_inner, flow_node_count,
schedule_type, `operator`, wait_order,
run_id)
values (#{waitId,jdbcType=INTEGER}, #{flowId,jdbcType=INTEGER}, #{flowName,jdbcType=VARCHAR},
#{flowVersionName,jdbcType=VARCHAR}, #{flowTimeout,jdbcType=BIGINT}, #{alarmEmail,jdbcType=VARCHAR},
#{alarmlAction,jdbcType=CHAR}, #{priority,jdbcType=CHAR}, #{triggerTime,jdbcType=BIGINT},
#{principal,jdbcType=VARCHAR}, #{isInner,jdbcType=CHAR}, #{flowNodeCount,jdbcType=INTEGER},
#{scheduleType,jdbcType=INTEGER}, #{operator,jdbcType=VARCHAR}, #{waitOrder,jdbcType=INTEGER},
#{runId,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.byit.model.WaitingRecord">
<!-- generated @mbg.generated date: 2020-03-11 -->
<insert id="insertSelective" useGeneratedKeys="true" keyProperty="waitId" parameterType="com.byit.model.WaitingRecord">
<!-- generated @mbg.generated date: 2020-03-12 -->
insert into waiting_record
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="waitId != null">
......@@ -158,7 +144,7 @@
</trim>
</insert>
<update id="updateByIdSelective" parameterType="com.byit.model.WaitingRecord">
<!-- generated @mbg.generated date: 2020-03-11 -->
<!-- generated @mbg.generated date: 2020-03-12 -->
update waiting_record
<set>
<if test="flowId != null">
......@@ -209,24 +195,5 @@
</set>
where wait_id = #{waitId,jdbcType=INTEGER}
</update>
<update id="updateById" parameterType="com.byit.model.WaitingRecord">
<!-- generated @mbg.generated date: 2020-03-11 -->
update waiting_record
set flow_id = #{flowId,jdbcType=INTEGER},
flow_name = #{flowName,jdbcType=VARCHAR},
flow_version_name = #{flowVersionName,jdbcType=VARCHAR},
flow_timeout = #{flowTimeout,jdbcType=BIGINT},
alarm_email = #{alarmEmail,jdbcType=VARCHAR},
alarml_action = #{alarmlAction,jdbcType=CHAR},
priority = #{priority,jdbcType=CHAR},
trigger_time = #{triggerTime,jdbcType=BIGINT},
principal = #{principal,jdbcType=VARCHAR},
is_inner = #{isInner,jdbcType=CHAR},
flow_node_count = #{flowNodeCount,jdbcType=INTEGER},
schedule_type = #{scheduleType,jdbcType=INTEGER},
`operator` = #{operator,jdbcType=VARCHAR},
wait_order = #{waitOrder,jdbcType=INTEGER},
run_id = #{runId,jdbcType=VARCHAR}
where wait_id = #{waitId,jdbcType=INTEGER}
</update>
</mapper>
\ No newline at end of file
byit-myth-core/myth-admin-core/src/main/resources/mapper/WaitingTaskMapper.xml
......@@ -2,9 +2,9 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.byit.mapper.WaitingTaskMapper">
<resultMap id="BaseResultMap" type="com.byit.model.WaitingTask">
<!-- generated @mbg.generated date: 2020-03-11 -->
<!-- generated @mbg.generated date: 2020-03-12 -->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="run_id" jdbcType="VARCHAR" property="runId" />
<result column="wait_id" jdbcType="VARCHAR" property="waitId" />
<result column="node_id" jdbcType="INTEGER" property="nodeId" />
<result column="node_name" jdbcType="VARCHAR" property="nodeName" />
<result column="node_desc" jdbcType="VARCHAR" property="nodeDesc" />
......@@ -37,23 +37,23 @@
<result column="schedule_type" jdbcType="INTEGER" property="scheduleType" />
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.byit.model.WaitingTask">
<!-- generated @mbg.generated date: 2020-03-11 -->
<!-- generated @mbg.generated date: 2020-03-12 -->
<result column="run_source" jdbcType="LONGVARCHAR" property="runSource" />
</resultMap>
<sql id="Base_Column_List">
<!-- generated @mbg.generated date: 2020-03-11 -->
id, run_id, node_id, node_name, node_desc, job_type, handler_name, node_timeout,
<!-- generated @mbg.generated date: 2020-03-12 -->
id, wait_id, node_id, node_name, node_desc, job_type, handler_name, node_timeout,
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
</sql>
<sql id="Blob_Column_List">
<!-- generated @mbg.generated date: 2020-03-11 -->
<!-- generated @mbg.generated date: 2020-03-12 -->
run_source
</sql>
<select id="getById" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
<!-- generated @mbg.generated date: 2020-03-11 -->
<!-- generated @mbg.generated date: 2020-03-12 -->
select
<include refid="Base_Column_List" />
,
......@@ -62,46 +62,20 @@
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteById" parameterType="java.lang.Integer">
<!-- generated @mbg.generated date: 2020-03-11 -->
<!-- generated @mbg.generated date: 2020-03-12 -->
delete from waiting_task
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.byit.model.WaitingTask">
<!-- generated @mbg.generated date: 2020-03-11 -->
insert into waiting_task (id, run_id, node_id,
node_name, node_desc, job_type,
handler_name, node_timeout, 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, run_source
)
values (#{id,jdbcType=INTEGER}, #{runId,jdbcType=VARCHAR}, #{nodeId,jdbcType=INTEGER},
#{nodeName,jdbcType=VARCHAR}, #{nodeDesc,jdbcType=VARCHAR}, #{jobType,jdbcType=VARCHAR},
#{handlerName,jdbcType=VARCHAR}, #{nodeTimeout,jdbcType=BIGINT}, #{flowId,jdbcType=INTEGER},
#{versionName,jdbcType=VARCHAR}, #{pluginToken,jdbcType=VARCHAR}, #{gatewayToken,jdbcType=VARCHAR},
#{mapFlowId,jdbcType=INTEGER}, #{isVirtual,jdbcType=CHAR}, #{pluginUrls,jdbcType=VARCHAR},
#{priority,jdbcType=CHAR}, #{failedRetryCount,jdbcType=INTEGER}, #{failedRetryInterval,jdbcType=BIGINT},
#{blockStrategy,jdbcType=VARCHAR}, #{routingStrategy,jdbcType=VARCHAR}, #{runParam,jdbcType=VARCHAR},
#{runSourceDesc,jdbcType=VARCHAR}, #{runCommand,jdbcType=VARCHAR}, #{scriptUrls,jdbcType=VARCHAR},
#{sourcePrincipal,jdbcType=VARCHAR}, #{triggerTime,jdbcType=BIGINT}, #{flowName,jdbcType=VARCHAR},
#{superSuccessRun,jdbcType=CHAR}, #{reRunId,jdbcType=VARCHAR}, #{nodeDepend,jdbcType=VARCHAR},
#{operator,jdbcType=VARCHAR}, #{scheduleType,jdbcType=INTEGER}, #{runSource,jdbcType=LONGVARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.byit.model.WaitingTask">
<!-- generated @mbg.generated date: 2020-03-11 -->
<insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.byit.model.WaitingTask">
<!-- generated @mbg.generated date: 2020-03-12 -->
insert into waiting_task
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="runId != null">
run_id,
<if test="waitId != null">
wait_id,
</if>
<if test="nodeId != null">
node_id,
......@@ -201,8 +175,8 @@
<if test="id != null">
#{id,jdbcType=INTEGER},
</if>
<if test="runId != null">
#{runId,jdbcType=VARCHAR},
<if test="waitId != null">
#{waitId,jdbcType=VARCHAR},
</if>
<if test="nodeId != null">
#{nodeId,jdbcType=INTEGER},
......@@ -299,12 +273,13 @@
</if>
</trim>
</insert>
<update id="updateByIdSelective" parameterType="com.byit.model.WaitingTask">
<!-- generated @mbg.generated date: 2020-03-11 -->
<!-- generated @mbg.generated date: 2020-03-12 -->
update waiting_task
<set>
<if test="runId != null">
run_id = #{runId,jdbcType=VARCHAR},
<if test="waitId != null">
wait_id = #{waitId,jdbcType=VARCHAR},
</if>
<if test="nodeId != null">
node_id = #{nodeId,jdbcType=INTEGER},
......@@ -403,9 +378,9 @@
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKeyWithBLOBs" parameterType="com.byit.model.WaitingTask">
<!-- generated @mbg.generated date: 2020-03-11 -->
<!-- generated @mbg.generated date: 2020-03-12 -->
update waiting_task
set run_id = #{runId,jdbcType=VARCHAR},
set wait_id = #{waitId,jdbcType=VARCHAR},
node_id = #{nodeId,jdbcType=INTEGER},
node_name = #{nodeName,jdbcType=VARCHAR},
node_desc = #{nodeDesc,jdbcType=VARCHAR},
......@@ -439,40 +414,5 @@
run_source = #{runSource,jdbcType=LONGVARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateById" parameterType="com.byit.model.WaitingTask">
<!-- generated @mbg.generated date: 2020-03-11 -->
update waiting_task
set run_id = #{runId,jdbcType=VARCHAR},
node_id = #{nodeId,jdbcType=INTEGER},
node_name = #{nodeName,jdbcType=VARCHAR},
node_desc = #{nodeDesc,jdbcType=VARCHAR},
job_type = #{jobType,jdbcType=VARCHAR},
handler_name = #{handlerName,jdbcType=VARCHAR},
node_timeout = #{nodeTimeout,jdbcType=BIGINT},
flow_id = #{flowId,jdbcType=INTEGER},
version_name = #{versionName,jdbcType=VARCHAR},
plugin_token = #{pluginToken,jdbcType=VARCHAR},
gateway_token = #{gatewayToken,jdbcType=VARCHAR},
map_flow_id = #{mapFlowId,jdbcType=INTEGER},
is_virtual = #{isVirtual,jdbcType=CHAR},
plugin_urls = #{pluginUrls,jdbcType=VARCHAR},
priority = #{priority,jdbcType=CHAR},
failed_retry_count = #{failedRetryCount,jdbcType=INTEGER},
failed_retry_interval = #{failedRetryInterval,jdbcType=BIGINT},
block_strategy = #{blockStrategy,jdbcType=VARCHAR},
routing_strategy = #{routingStrategy,jdbcType=VARCHAR},
run_param = #{runParam,jdbcType=VARCHAR},
run_source_desc = #{runSourceDesc,jdbcType=VARCHAR},
run_command = #{runCommand,jdbcType=VARCHAR},
script_urls = #{scriptUrls,jdbcType=VARCHAR},
source_principal = #{sourcePrincipal,jdbcType=VARCHAR},
trigger_time = #{triggerTime,jdbcType=BIGINT},
flow_name = #{flowName,jdbcType=VARCHAR},
super_success_run = #{superSuccessRun,jdbcType=CHAR},
re_run_id = #{reRunId,jdbcType=VARCHAR},
node_depend = #{nodeDepend,jdbcType=VARCHAR},
`operator` = #{operator,jdbcType=VARCHAR},
schedule_type = #{scheduleType,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update>
</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