third_codes/PowerJob
1
0
Fork 1
mirror of https://github.com/PowerJob/PowerJob.git synced 2025-07-17 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] fix compile error and go to loading and unloading snow beer

Browse Source
This commit is contained in:
tjq 2020-05-27 14:00:35 +08:00
parent 2833aae9b6
commit 2998c84ee3
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/WorkflowDAG.java
View File

@ -31,7 +31,7 @@ public class WorkflowDAG {
// 运行时参数 // 运行时参数
private Long instanceId; private Long instanceId;
private boolean finished = false; private boolean finished;
private String result; private String result;
} }
} }

2
oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/WorkflowDAGUtils.java
View File

@ -34,7 +34,7 @@ public class WorkflowDAGUtils {
// 创建节点 // 创建节点
PEWorkflowDAG.getNodes().forEach(node -> { PEWorkflowDAG.getNodes().forEach(node -> {
Long jobId = node.getJobId(); Long jobId = node.getJobId();
WorkflowDAG.Node n = new WorkflowDAG.Node(Lists.newLinkedList(), jobId, node.getJobName(), null, null, null); WorkflowDAG.Node n = new WorkflowDAG.Node(Lists.newLinkedList(), jobId, node.getJobName(), null, false, null);
id2Node.put(jobId, n); id2Node.put(jobId, n);
// 初始阶段，每一个点都设为顶点 // 初始阶段，每一个点都设为顶点

2
oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/WorkflowInfoRepository.java
View File

@ -21,5 +21,5 @@ public interface WorkflowInfoRepository extends JpaRepository<WorkflowInfoDO, Lo
// 对外查询（list）三兄弟 // 对外查询（list）三兄弟
Page<WorkflowInfoDO> findByAppIdAndStatusNot(Long appId, int nStatus, Pageable pageable); Page<WorkflowInfoDO> findByAppIdAndStatusNot(Long appId, int nStatus, Pageable pageable);
Page<WorkflowInfoDO> findByIdAndStatusNot(Long id, int nStatus, Pageable pageable); Page<WorkflowInfoDO> findByIdAndStatusNot(Long id, int nStatus, Pageable pageable);
Page<WorkflowInfoDO> findByAppIdInAndStatusNotAndWfNameLike(Long appId, int nStatus, String condition, Pageable pageable); Page<WorkflowInfoDO> findByAppIdAndStatusNotAndWfNameLike(Long appId, int nStatus, String condition, Pageable pageable);
} }

2
oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/DispatchService.java
View File

@ -42,7 +42,7 @@ public class DispatchService {
public void redispatch(JobInfoDO jobInfo, long instanceId, long currentRunningTimes) { public void redispatch(JobInfoDO jobInfo, long instanceId, long currentRunningTimes) {
InstanceInfoDO instanceInfo = instanceInfoRepository.findByInstanceId(instanceId); InstanceInfoDO instanceInfo = instanceInfoRepository.findByInstanceId(instanceId);
dispatch(jobInfo, instanceId, currentRunningTimes, instanceInfo.getInstanceParams(), instanceInfo.getWorkflowId()); dispatch(jobInfo, instanceId, currentRunningTimes, instanceInfo.getInstanceParams(), instanceInfo.getWfInstanceId());
} }
/** /**

2
oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/WorkflowController.java
View File

@ -66,7 +66,7 @@ public class WorkflowController {
wfPage = workflowInfoRepository.findByIdAndStatusNot(req.getWorkflowId(), nStatus, pageRequest); wfPage = workflowInfoRepository.findByIdAndStatusNot(req.getWorkflowId(), nStatus, pageRequest);
}else { }else {
String condition = "%" + req.getKeyword() + "%"; String condition = "%" + req.getKeyword() + "%";
wfPage = workflowInfoRepository.findByAppIdInAndStatusNotAndWfNameLike(req.getAppId(), nStatus, condition, pageRequest); wfPage = workflowInfoRepository.findByAppIdAndStatusNotAndWfNameLike(req.getAppId(), nStatus, condition, pageRequest);
} }
return ResultDTO.success(convertPage(wfPage)); return ResultDTO.success(convertPage(wfPage));
} }