重跑虚节点拉取虚节点的日志信息

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

 package com.byit.service.mapservice.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.byit.dto.BeanStrategyPackage;
@@ -173,6 +174,25 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
 
         runRecordingService.saveRunRecording(runRecording);
         log.info("-----------【虚节点对应节点保存到任务表】--------------");
+
+        //如果是重跑
+        if(ScheduleTypeEnum.REPEAT.getCode().equals(jobTask.getScheduleType())){
+            //查询日志信息 转换Wie对应的虚节点
+            List<JobTaskRunLogWithBLOBs> byFlowIdAndRunIdList = jobTaskRunLogService.findJobTaskRunLogWithBLOBsByFlowIdAndRunId(jobTask.getMapFlowId(), jobTaskRunLog.getReRunId());
+            List<JobTask> collect = byFlowIdAndRunIdList.stream().map(byFlowIdAndRunId -> {
+                JobTask jobTaskTarget = new JobTask();
+                if(repair) {
+                    jobTaskTarget.setOperator(jobTask.getOperator());
+                }
+                BeanUtil.copyProperties(byFlowIdAndRunId, jobTaskTarget);
+                jobTaskTarget.setRunParam(byFlowIdAndRunId.getRunParams());
+                jobTaskTarget.setTriggerTime(System.currentTimeMillis());
+                jobTaskTarget.setTriggerStatus("1");
+                return jobTaskTarget;
+            }).collect(Collectors.toList());
+
+            jobTaskService.saveJobTasks(collect);
+        }else{
             //获取所有的节点，开始将所有节点保存到任务表
             List<Node> nodeByFlowIdAndVersionName = nodeService.findNodeByFlowIdAndVersionName(mapFlowId);
             List<JobTask> jobTasks = nodeByFlowIdAndVersionName.stream()
@@ -209,6 +229,8 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
                         return task;
                     }).collect(Collectors.toList());
             jobTaskService.saveJobTasks(jobTasks);
+        }
+
         log.info("----------------【虚节点保存成功，删除虚节点】--------------------");
         jobTaskService.removeMythJobTaskById(jobTask.getId());
         log.info("-----------saveRunRecordingAndTask end【虚节点保存服务】--------------");

byit-myth-core/myth-admin-core/src/main/java/com/byit/strategy/task/script/ScriptMakeUpScriptTaskCallbackRunTheLifeCycleCallback.java

@@ -50,7 +50,7 @@ public class ScriptMakeUpScriptTaskCallbackRunTheLifeCycleCallback implements Ta
         boolean isScript = typeByCode.getType().equals(SCRIPT);
         //是否是重跑或者补批
         boolean isNormal = ScheduleTypeEnum.REPEAT.getCode().equals(jobTaskSchedule.getScheduleType()) || ScheduleTypeEnum.REPAIR.getCode().equals(jobTaskSchedule.getScheduleType());
-        return isScript && isNormal;
+        return isScript || isNormal;
     }
 
     /**