Merge remote-tracking branch 'origin/developer' into developer

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

@@ -97,7 +97,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/service/mapservice/RunRecordingAndJobTaskService.java

@@ -14,9 +14,10 @@ public interface RunRecordingAndJobTaskService {
      * 保存运行记录
      * 保存任务节点
      * @param jobTask
+     * @param repair 是否是补批
      * @throws Exception
      */
-    void saveRunRecordingAndTask(JobTask jobTask) throws Exception;
+    void saveRunRecordingAndTask(JobTask jobTask,boolean repair) throws Exception;
 
     /**
      * 修改运行记录，保存task节点 修改log日志

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

@@ -58,10 +58,11 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
      * 保存运行记录
      * 保存任务节点
      * @param jobTask
+     * @param repair 是否是补批
      * @throws Exception
      */
     @Override
-    public void     saveRunRecordingAndTask(JobTask jobTask) throws UnknownHostException, ParseException {
+    public void     saveRunRecordingAndTask(JobTask jobTask,boolean repair) throws UnknownHostException, ParseException {
         log.info("-----------saveRunRecordingAndTask start【虚节点保存服务】--------------");
         //根据 map_flow_id查询当前的版本的工作流  使用祝工作流的runId 保存到执行记录表和任务表
         Integer mapFlowId = jobTask.getMapFlowId();
@@ -117,6 +118,10 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
                 .failFast(RunRecordingEnum.FAIL_FAST_NO.getCode())
                 .workspaceId(virFlow.getWorkspaceId())
                 .build();
+        if(repair) {
+            runRecording.setOperator(jobTask.getOperator());
+            runRecording.setScheduleType(jobTask.getScheduleType());
+        }
         runRecordingService.saveRunRecording(runRecording);
         log.info("-----------【虚节点对应节点保存到任务表】--------------");
         //获取所有的节点，开始将所有节点保存到任务表
@@ -147,6 +152,10 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
                     task.setRunId(jobTask.getRunId());
                     task.setTriggerStatus("1");
                     task.setFlowName(runRecording.getFlowName());
+                    if(repair) {
+                        task.setOperator(jobTask.getOperator());
+                        task.setScheduleType(jobTask.getScheduleType());
+                    }
                     return task;
                 }).collect(Collectors.toList());
         jobTaskService.saveJobTasks(jobTasks);

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

@@ -93,8 +93,10 @@ public class JobTaskThreadRunHelper extends BaseThreadRunHelper {
                             if (ScheduleTypeEnum.REPEAT.getCode().equals(scheduleType)){
                                 log.debug("虚节点{},是重跑状态", jobTask);
                                 runRecordingAndJobTaskService.updateRunRecordingAndSaveTask(jobTask);
+                            }else if (ScheduleTypeEnum.REPAIR.getCode().equals(scheduleType)){
+                                runRecordingAndJobTaskService.saveRunRecordingAndTask(jobTask,true);
                             }else {
-                                runRecordingAndJobTaskService.saveRunRecordingAndTask(jobTask);
+                                runRecordingAndJobTaskService.saveRunRecordingAndTask(jobTask,false);
                             }
                         }
                     }catch (SuperiorNodeRunException se) {

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

@@ -201,7 +201,7 @@ public class TaskThreadRunHelper extends BaseThreadRunHelper {
      */
     private void innerNodeOperating(JobTask thisJobTask){
         try {
-            runRecordingAndJobTaskService.saveRunRecordingAndTask(thisJobTask);
+            runRecordingAndJobTaskService.saveRunRecordingAndTask(thisJobTask,false);
 
         } catch (Exception e) {
             log.error("--------------------虚节点处理出现异常{}------------------",e.getMessage());