增加重跑的条件

byit-myth-core/myth-admin-core/src/main/java/com/byit/thread/helper/JobTaskThreadRunHelper.java

@@ -117,11 +117,8 @@ public class JobTaskThreadRunHelper extends BaseThreadRunHelper {
                         //普通节点
                         try {
                             //如果是补批节点 而且没有依赖节点的话，按照开始节点处理
-                            if( ScheduleTypeEnum.REPAIR.getCode().equals(jobTask.getScheduleType()) || ScheduleTypeEnum.REPEAT.getCode().equals(jobTask.getScheduleType())){
-                                if(StringUtils.isBlank(jobTask.getNodeDepend())) {
-                                    startNodeOperating(jobTask,jobTaskSchedules);
-                                }
-
+                            if( ScheduleTypeEnum.REPAIR.getCode().equals(jobTask.getScheduleType()) && StringUtils.isBlank(jobTask.getNodeDepend())){
+                                startNodeOperating(jobTask,jobTaskSchedules);
                             }else if (nodeVerification.superiorNodeStatus(jobTask)) {
                                 //断定上级节点是否执行成功
                                 runJobTask(jobTask,jobTaskSchedules);
@@ -153,6 +150,15 @@ public class JobTaskThreadRunHelper extends BaseThreadRunHelper {
         //更改运行记录为运行中
         String runId = thisJobTask.getRunId();
         Integer flowId = thisJobTask.getFlowId();
+        updateRunRecording(flowId,runId);
+    }
+
+    /**
+     * 记录修改为运行中
+     * @param flowId
+     * @param runId
+     */
+    private void updateRunRecording (Integer flowId, String runId) {
         RunRecording runRecordingByFlowIdAndRunId = runRecordingService.findRunRecordingByFlowIdAndRunId(flowId, runId);
         runRecordingByFlowIdAndRunId.setFlowStatus(FlowPropertyEnum.FLOW_RUN_ING.getCode());
         runRecordingByFlowIdAndRunId.setStartTime(new Date());
@@ -179,5 +185,12 @@ public class JobTaskThreadRunHelper extends BaseThreadRunHelper {
         JobTaskSchedule jobTaskSchedule = new JobTaskSchedule();
         BeanUtils.copyProperties(jobTask,jobTaskSchedule);
         jobTaskSchedules.add(jobTaskSchedule);
+
+        if (ScheduleTypeEnum.REPEAT.getCode().equals(jobTask.getScheduleType())) {
+            //更改运行记录为运行中
+            String runId = jobTask.getRunId();
+            Integer flowId = jobTask.getFlowId();
+            updateRunRecording(flowId,runId);
+        }
     }
 }