重跑增加操作人

byit-myth-admin/src/main/java/com/byit/api/ApiFlowController.java

@@ -2,6 +2,7 @@ package com.byit.api;
 
 import com.byit.dto.executor.KillDto;
 import com.byit.dto.plugin.CollectData;
+import com.byit.dto.plugin.RunInfo;
 import com.byit.dto.plugin.StopFlowParam;
 import com.byit.dto.recording.LoadScheduleCondition;
 import com.byit.dto.specials.RepairFlow;
@@ -122,9 +123,8 @@ public class ApiFlowController {
 
     @PostMapping("reRunFlow")
     @ApiOperation("重跑工作流")
-    public ResponseResult reRunFlow(String param) {
+    public void reRunFlow(@RequestBody RunInfo param) {
         apiFlowService.reRunFlow(param);
-        return ResponseResult.ok("SUCCESS");
     }
 
     @PostMapping("madeSuccess")

byit-myth-admin/src/main/java/com/byit/service/ApiFlowService.java

@@ -2,6 +2,7 @@ package com.byit.service;
 
 import com.byit.dto.plugin.CollectData;
 import com.byit.dto.plugin.PluginFlow;
+import com.byit.dto.plugin.RunInfo;
 import com.byit.dto.plugin.StopFlowParam;
 import com.byit.dto.recording.LoadScheduleCondition;
 import com.byit.dto.specials.RepairFlow;
@@ -60,7 +61,7 @@ public interface ApiFlowService {
      * 重跑工作流
      * @param param
      */
-    void reRunFlow(String param);
+    void reRunFlow(RunInfo param);
 
     /**
      * 加载运行记录

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

@@ -303,6 +303,7 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
         if (order == null) {
             order = 0;
         }
+        //传递过来的公共参数格式化
         Map<String,String> publicMap = JSON.parseObject(publicParam, Map.class);
         if(CollectionUtil.isEmpty(publicMap)){
             publicMap = new HashMap<>(8);

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

@@ -641,9 +641,9 @@ public class ApiFlowServiceImpl implements ApiFlowService {
 
 
     @Override
-    public void reRunFlow(String param) {
-        ValidationUtil.dataNotBank(param, "请求参数不允许为空！");
-        RunInfo runInfo = JSON.parseObject(param, RunInfo.class);
+    public void reRunFlow(RunInfo runInfo) {
+        ValidationUtil.dataNotNull(runInfo, "请求参数不允许为空！");
+
         //获取工作空间名称
         ValidationUtil.dataNotBank(runInfo.getWorkspaceName(), "工作空间名称不允许为空！");
         //获取工作流名称
@@ -677,6 +677,7 @@ public class ApiFlowServiceImpl implements ApiFlowService {
             WaitingRecord waitingRecord = new WaitingRecord();
             //生成新的实例
             RunRecording newRunRecording = buildRunRecording(runRecording, triggerTime, reRunId, jobTaskRunLogList.size(), userName);
+            newRunRecording.setOperator(runInfo.getOperator());
             BeanUtils.copyProperties(newRunRecording, waitingRecord);
             Integer order = waitingRecordMapper.findOrderByFlowId(flow.getFlowId());
             if (order == null) {

byit-myth-core/myth-dto-core/src/main/java/com/byit/dto/plugin/RunInfo.java

@@ -35,4 +35,8 @@ public class RunInfo {
      * 节点名称    重跑节点和手动置为成功时需要
      */
     private String nodeName;
+    /**
+     * 操作人
+     */
+    private String operator;
 }

byit-myth-executor/myth-executor-plugin/src/main/java/com/byit/utils/JobUtils.java

@@ -550,7 +550,7 @@ public class JobUtils {
      */
     public static ResponseResult reRunFlow(RunInfo runInfo) {
         //发送请求 添加任务
-        String response = createHttpRequest(REQUEST_FLOW_RERUNFLOW, "param=" + JSON.toJSONString(runInfo, WriteClassName));
+        String response = createHttpRequest(REQUEST_FLOW_RERUNFLOW, JSON.toJSONString(runInfo, WriteClassName));
         log.debug("--------------------重跑节点接口调用成功，结果为：{}------------------------", response);
         return JSON.parseObject(response, ResponseResult.class);
     }