重跑时拿实例的信息来构建本次信息

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

@@ -551,8 +551,9 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         }
 
         WaitingRecord waitingRecord = new WaitingRecord();
-        RunRecording newRunRecording = buildRunRecording(runRecording, triggerTime, reRunId, flow, userName);
-        newRunRecording.setFlowNodeCount(waitingTaskList.size());
+        //构建运行实例
+        RunRecording newRunRecording = buildRunRecording(runRecording, triggerTime, reRunId, waitingTaskList.size(), userName);
+
         BeanUtils.copyProperties(newRunRecording, waitingRecord);
         Integer order = waitingRecordMapper.findOrderByFlowId(flow.getFlowId());
         if (order == null){
@@ -569,17 +570,33 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         });
     }
 
-    private RunRecording buildRunRecording(RunRecording runRecording, Long triggerTime, String reRunId, Flow flow, String userName) {
+    /**
+     * 构建运行实例
+     * @param runRecording      旧的运行实例
+     * @param triggerTime       本次触发时间
+     * @param reRunId            重跑的实例id
+     * @param scheduleNodeCount  本次实例的重跑节点数目
+     * @param userName           重跑操作人
+     * @return
+     */
+    private RunRecording buildRunRecording(RunRecording runRecording, Long triggerTime, String reRunId, int scheduleNodeCount, String userName) {
 
         RunRecording newRunRecording = new RunRecording();
 
-        BeanUtils.copyProperties(flow, newRunRecording);
-        newRunRecording.setFlowVersionName(flow.getVersionName());
+        BeanUtils.copyProperties(runRecording, newRunRecording);
+        //设置执行结果为未执行
+        newRunRecording.setFlowRunResult("0");
+        //设置运行状态为未开始
+        newRunRecording.setFlowStatus("1");
         newRunRecording.setTriggerTime(triggerTime);
         newRunRecording.setReRunId(runRecording.getRunId());
         newRunRecording.setRunId(reRunId);
         newRunRecording.setOperator(userName);
         newRunRecording.setScheduleType(ScheduleTypeEnum.REPEAT.getCode());
+        newRunRecording.setStartTime(null);
+        newRunRecording.setEndTime(null);
+        //设置实例下节点数目
+        newRunRecording.setFlowNodeCount(scheduleNodeCount);
 
         return newRunRecording;
     }
@@ -621,7 +638,7 @@ public class ApiFlowServiceImpl implements ApiFlowService {
 
             WaitingRecord waitingRecord = new WaitingRecord();
             //生成新的实例
-            RunRecording newRunRecording = buildRunRecording(runRecording, triggerTime, reRunId, flow, userName);
+            RunRecording newRunRecording = buildRunRecording(runRecording, triggerTime, reRunId, jobTaskRunLogList.size(), userName);
             BeanUtils.copyProperties(newRunRecording, waitingRecord);
             Integer order = waitingRecordMapper.findOrderByFlowId(flow.getFlowId());
             if (order == null){