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
373de7c1
Commit
373de7c1
authored
Jul 10, 2020
by
huangfusuper
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
处理停止后的僵尸节点以及不告警BUG
parent
985fd6a8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
0 deletions
+21
-0
JobTaskService.java
...n-core/src/main/java/com/byit/service/JobTaskService.java
+2
-0
FlowServiceImpl.java
.../src/main/java/com/byit/service/impl/FlowServiceImpl.java
+14
-0
JobTaskServiceImpl.java
...c/main/java/com/byit/service/impl/JobTaskServiceImpl.java
+5
-0
No files found.
byit-myth-core/myth-admin-core/src/main/java/com/byit/service/JobTaskService.java
View file @
373de7c1
...
@@ -48,6 +48,8 @@ public interface JobTaskService {
...
@@ -48,6 +48,8 @@ public interface JobTaskService {
*/
*/
void
removeMythJobTaskById
(
Integer
id
);
void
removeMythJobTaskById
(
Integer
id
);
void
update
(
JobTask
jobTask
);
/**
/**
* 根据集合删除
* 根据集合删除
* @param jobTasks
* @param jobTasks
...
...
byit-myth-core/myth-admin-core/src/main/java/com/byit/service/impl/FlowServiceImpl.java
View file @
373de7c1
...
@@ -7,6 +7,7 @@ import com.byit.dto.FlowConditionDto;
...
@@ -7,6 +7,7 @@ import com.byit.dto.FlowConditionDto;
import
com.byit.dto.StatisticsConditionDto
;
import
com.byit.dto.StatisticsConditionDto
;
import
com.byit.dto.web.ResponseResult
;
import
com.byit.dto.web.ResponseResult
;
import
com.byit.enums.FlowPropertyEnum
;
import
com.byit.enums.FlowPropertyEnum
;
import
com.byit.enums.JobTriggerStatusEnums
;
import
com.byit.enums.NodePropertyEnum
;
import
com.byit.enums.NodePropertyEnum
;
import
com.byit.job.utils.CronExpression
;
import
com.byit.job.utils.CronExpression
;
import
com.byit.mapper.*
;
import
com.byit.mapper.*
;
...
@@ -16,6 +17,7 @@ import com.byit.model.vo.FlowViewVo;
...
@@ -16,6 +17,7 @@ import com.byit.model.vo.FlowViewVo;
import
com.byit.model.vo.FlowVo
;
import
com.byit.model.vo.FlowVo
;
import
com.byit.model.vo.NodeVo
;
import
com.byit.model.vo.NodeVo
;
import
com.byit.service.FlowService
;
import
com.byit.service.FlowService
;
import
com.byit.service.JobTaskService
;
import
com.byit.util.FlowInitUtil
;
import
com.byit.util.FlowInitUtil
;
import
com.byit.utils.ValidationUtil
;
import
com.byit.utils.ValidationUtil
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
...
@@ -52,6 +54,8 @@ public class FlowServiceImpl implements FlowService {
...
@@ -52,6 +54,8 @@ public class FlowServiceImpl implements FlowService {
private
RunRecordingMapper
runRecordingMapper
;
private
RunRecordingMapper
runRecordingMapper
;
@Resource
@Resource
private
WorkspaceMapper
workspaceMapper
;
private
WorkspaceMapper
workspaceMapper
;
@Resource
private
JobTaskService
jobTaskService
;
/**
/**
...
@@ -458,6 +462,16 @@ public class FlowServiceImpl implements FlowService {
...
@@ -458,6 +462,16 @@ public class FlowServiceImpl implements FlowService {
}
}
}
}
}
}
//释放该工作流下所由暂停的节点
runRecordingList
.
forEach
(
runRecording
->
{
String
runIdS
=
runRecording
.
getRunId
();
List
<
JobTask
>
byRunId
=
jobTaskService
.
findByRunId
(
runIdS
);
List
<
JobTask
>
stopTask
=
byRunId
.
stream
().
filter
(
task
->
JobTriggerStatusEnums
.
STOP
.
getCode
().
equals
(
task
.
getTriggerStatus
())).
collect
(
Collectors
.
toList
());
stopTask
.
forEach
(
task
->{
task
.
setTriggerStatus
(
JobTriggerStatusEnums
.
START
.
getCode
());
jobTaskService
.
update
(
task
);
});
});
return
result
;
return
result
;
}
}
...
...
byit-myth-core/myth-admin-core/src/main/java/com/byit/service/impl/JobTaskServiceImpl.java
View file @
373de7c1
...
@@ -71,6 +71,11 @@ public class JobTaskServiceImpl implements JobTaskService {
...
@@ -71,6 +71,11 @@ public class JobTaskServiceImpl implements JobTaskService {
jobTaskMapper
.
deleteById
(
id
);
jobTaskMapper
.
deleteById
(
id
);
}
}
@Override
public
void
update
(
JobTask
jobTask
)
{
jobTaskMapper
.
updateJobTask
(
jobTask
);
}
/**
/**
* 删除多个任务 根据id
* 删除多个任务 根据id
* @param jobTaskSchedules 任务实体
* @param jobTaskSchedules 任务实体
...
...
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