Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
byit-myth-job
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liyuan
byit-myth-job
Commits
f9da5bb2
Commit
f9da5bb2
authored
Jan 08, 2020
by
huangfusuper
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【BUg修改】自动扫描即将执行的工作流BUG修改完毕
parent
fd3e90d9
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
JobScheduleHelper.java
...core/src/main/java/com/byit/thread/JobScheduleHelper.java
+6
-1
JobTaskRunLogMapper.xml
...in-core/src/main/resources/mapper/JobTaskRunLogMapper.xml
+1
-0
Mains.java
...nt/byit-demo-client/src/main/java/com/byit/job/Mains.java
+2
-2
No files found.
byit-myth-core/myth-admin-core/src/main/java/com/byit/thread/JobScheduleHelper.java
View file @
f9da5bb2
...
...
@@ -146,17 +146,22 @@ public class JobScheduleHelper{
BeanUtils
.
copyProperties
(
jobTask
,
jobTaskSchedule
);
jobTaskSchedules
.
add
(
jobTaskSchedule
);
}
else
{
//查询该节点的依赖节点
List
<
Integer
>
dependIdByNodeId
=
nodeDependencyService
.
findDependIdByNodeId
(
jobTask
.
getNodeId
());
//这里返回的是上级节点的日志执行情况
List
<
JobTaskRunLog
>
jobTaskRunLogList
=
jobTaskRunLogService
.
findJobTaskRunLogNotEndNodeByRunCodeCount
(
dependIdByNodeId
,
jobTask
.
getRunId
());
//如果上级节点为空的情况,就证明他的伤及节点一个都没执行成功,直接到下一个节点
if
(
CollectionUtil
.
isEmpty
(
jobTaskRunLogList
)){
return
;
}
//如果不为空 证明是有父类节点的,那么就要判断
for
(
JobTaskRunLog
jobTaskRunLog
:
jobTaskRunLogList
){
//如果该节点不是成功的或者补批成功的 那么就跳过
if
(!(
"1"
.
equals
(
jobTaskRunLog
.
getRunCode
())
||
"3"
.
equals
(
jobTaskRunLog
.
getRunCode
()))){
return
;
}
}
//到这里 父类节点一定是全部都执行成功了!
JobTaskSchedule
jobTaskSchedule
=
new
JobTaskSchedule
();
BeanUtils
.
copyProperties
(
jobTask
,
jobTaskSchedule
);
jobTaskSchedules
.
add
(
jobTaskSchedule
);
...
...
byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskRunLogMapper.xml
View file @
f9da5bb2
...
...
@@ -40,6 +40,7 @@
run_msg, trigger_msg
</sql>
<!--这个差的是啥? 根据runId 和 上级节点的集合 查询所有的上级节点-->
<select
id=
"findJobTaskRunLogNotEndNodeByRunCodeCount"
resultMap=
"BaseResultMap"
>
select
<include
refid=
"Base_Column_List"
/>
from job_task_run_log
...
...
demo-client/byit-demo-client/src/main/java/com/byit/job/Mains.java
View file @
f9da5bb2
...
...
@@ -16,7 +16,7 @@ import java.io.IOException;
public
class
Mains
{
public
static
void
main
(
String
[]
args
)
throws
IOException
{
new
JobRunServerLauncher
(
8888
);
String
plServerUrl
=
"http://10.0.55.238:8888"
;
/*
String plServerUrl = "http://10.0.55.238:8888";
String mythCron = "时间";
String routingStrategy = LoadBalance.ROUND.name();
String blockingStrategy = "阻塞策略";
...
...
@@ -34,7 +34,7 @@ public class Mains {
javaBeanJobInfo1.setJobHandelName("END");
javaBeanJobInfo1.setParam("延迟任务");
JobUtils.addJob(javaBeanJobInfo1);
JobUtils
.
addJob
(
pluginBeanJobInfo
);
JobUtils.addJob(pluginBeanJobInfo);
*/
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment