From 2998c84ee32fdb60d0e95b1600592c768dffb0dc Mon Sep 17 00:00:00 2001
From: tjq <tengjiqi@gmail.com>
Date: Wed, 27 May 2020 14:00:35 +0800
Subject: [PATCH] [fix] fix compile error and go to loading and unloading snow 
 beer

---
 .../java/com/github/kfcfans/oms/common/model/WorkflowDAG.java   | 2 +-
 .../com/github/kfcfans/oms/common/utils/WorkflowDAGUtils.java   | 2 +-
 .../persistence/core/repository/WorkflowInfoRepository.java     | 2 +-
 .../com/github/kfcfans/oms/server/service/DispatchService.java  | 2 +-
 .../kfcfans/oms/server/web/controller/WorkflowController.java   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/WorkflowDAG.java b/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/WorkflowDAG.java
index f35aa0f4..a438963b 100644
--- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/WorkflowDAG.java
+++ b/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/model/WorkflowDAG.java
@@ -31,7 +31,7 @@ public class WorkflowDAG {
 
         // 运行时参数
         private Long instanceId;
-        private boolean finished = false;
+        private boolean finished;
         private String result;
     }
 }
diff --git a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/WorkflowDAGUtils.java b/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/WorkflowDAGUtils.java
index 7233c1a5..7e29d5b9 100644
--- a/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/WorkflowDAGUtils.java
+++ b/oh-my-scheduler-common/src/main/java/com/github/kfcfans/oms/common/utils/WorkflowDAGUtils.java
@@ -34,7 +34,7 @@ public class WorkflowDAGUtils {
         // 创建节点
         PEWorkflowDAG.getNodes().forEach(node -> {
             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);
 
             // 初始阶段，每一个点都设为顶点
diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/WorkflowInfoRepository.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/WorkflowInfoRepository.java
index cd2b736d..34fe2fe0 100644
--- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/WorkflowInfoRepository.java
+++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/persistence/core/repository/WorkflowInfoRepository.java
@@ -21,5 +21,5 @@ public interface WorkflowInfoRepository extends JpaRepository<WorkflowInfoDO, Lo
     // 对外查询（list）三兄弟
     Page<WorkflowInfoDO> findByAppIdAndStatusNot(Long appId, 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);
 }
diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/DispatchService.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/DispatchService.java
index f709ca0f..c727b68a 100644
--- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/DispatchService.java
+++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/service/DispatchService.java
@@ -42,7 +42,7 @@ public class DispatchService {
 
     public void redispatch(JobInfoDO jobInfo, long instanceId, long currentRunningTimes) {
         InstanceInfoDO instanceInfo = instanceInfoRepository.findByInstanceId(instanceId);
-        dispatch(jobInfo, instanceId, currentRunningTimes, instanceInfo.getInstanceParams(), instanceInfo.getWorkflowId());
+        dispatch(jobInfo, instanceId, currentRunningTimes, instanceInfo.getInstanceParams(), instanceInfo.getWfInstanceId());
     }
 
     /**
diff --git a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/WorkflowController.java b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/WorkflowController.java
index 57beb151..39c54c19 100644
--- a/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/WorkflowController.java
+++ b/oh-my-scheduler-server/src/main/java/com/github/kfcfans/oms/server/web/controller/WorkflowController.java
@@ -66,7 +66,7 @@ public class WorkflowController {
             wfPage = workflowInfoRepository.findByIdAndStatusNot(req.getWorkflowId(), nStatus, pageRequest);
         }else {
             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));
     }