解决重复执行的BUG

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/impl/RunNodeServiceImpl.java

@@ -82,7 +82,7 @@ public class RunNodeServiceImpl implements RunNodeServer, ApplicationEventPublis
             }else {
                 jobTask.setTriggerTime(node.getTriggerNextTime());
                 try {
-                    node.setTriggerNextTime(new CronExpression(node.getNodeCron()).getNextValidTimeAfter(new Date()).getTime());
+                    node.setTriggerNextTime(new CronExpression(node.getNodeCron()).getNextValidTimeAfter(new Date(node.getTriggerNextTime())).getTime());
                 } catch (ParseException e) {
                     e.printStackTrace();
                 }
@@ -101,7 +101,7 @@ public class RunNodeServiceImpl implements RunNodeServer, ApplicationEventPublis
         jobTaskService.saveJobTasks(jobTasks);
         log.info("-------------【开始修改工作流{}的下次运行时间，以及各种状态】---------------",flow);
         try {
-            flow.setTriggerNextTime(new CronExpression(flow.getFlowCron()).getNextValidTimeAfter(new Date()).getTime());
+            flow.setTriggerNextTime(new CronExpression(flow.getFlowCron()).getNextValidTimeAfter(new Date(flow.getTriggerNextTime())).getTime());
         } catch (ParseException e) {
             flow.setTriggerNextTime(999999999999999999L);
 

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

@@ -39,7 +39,11 @@ public class TimeoutExampleThreadRunHelper extends BaseThreadRunHelper {
         List<RunRecording> allRunIng = runRecordingService.findAllRunIng(new FlowConditionDto());
 
         List<RunRecording> timeoutRunRecordings = allRunIng.stream().filter(runRecording -> {
-            long startTime = runRecording.getTriggerTime();
+            Date startDate = runRecording.getStartTime();
+            if(startDate == null){
+                return false;
+            }
+            long startTime = startDate.getTime();
             long thisTime = System.currentTimeMillis();
             Long flowTimeout = runRecording.getFlowTimeout();
             long time = thisTime - startTime;
@@ -47,10 +51,7 @@ public class TimeoutExampleThreadRunHelper extends BaseThreadRunHelper {
         }).collect(Collectors.toList());
 
         if (CollectionUtil.isNotEmpty(timeoutRunRecordings)){
-            timeoutRunRecordings.forEach(timeoutRunRecording ->{
-
-                runRecordingAndLogService.logAndRunRecordingFailFast(timeoutRunRecording);
-            });
+            timeoutRunRecordings.forEach(runRecordingAndLogService::logAndRunRecordingFailFast);
         }
         return TimeUnit.MINUTES.toMillis(5);
     }