使用工作流名称开启工作流

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

@@ -132,7 +132,7 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
             List<WaitingRecord> waitingRecords = buildWaitingRecordList(flowByName, runId, nodeRelyDtoSet.size(), operator, repairTimeList);
             waitingRecords.forEach(waitingRecordMapper::insertSelective);
             List<RunRecording> runRecordings = buildRunRecordingList(waitingRecords);
-            List<WaitingTask> waitingTaskList = buildWaitingTaskResult(waitingRecords, nodeRelyDtoSet);
+            List<WaitingTask> waitingTaskList = buildWaitingTaskResult(waitingRecords, nodeRelyDtoSet, paramCarrier);
             runRecordings.forEach(runRecordingMapper::saveRunRecording);
             waitingTaskList.forEach(waitingTaskMapper::insertSelective);
         }
@@ -147,7 +147,7 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
      * @param nodeRelyDtoSet 节点对象
      * @return 返回一个等待队的全部节点
      */
-    private List<WaitingTask> buildWaitingTask(WaitingRecord waitingRecord, Set<NodeRelyDto> nodeRelyDtoSet) {
+    private List<WaitingTask> buildWaitingTask(WaitingRecord waitingRecord, Set<NodeRelyDto> nodeRelyDtoSet,Map<String,String> publicParam) {
         return nodeRelyDtoSet.stream().map(nodeRelyDto -> {
             Node node = nodeRelyDto.getNode();
             String relyId = nodeRelyDto.getRelyId();
@@ -172,17 +172,13 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
                 log.error("补批日期不符合规范，例：20200101");
                 ValidationUtil.isTrueValidation(true, "补批日期不符合规范，例：20200101");
             }
+            RunParamWrapped runParamWrapped = JSON.parseObject(node.getRunParam(), RunParamWrapped.class);
             //补批只替换不是java的节点
             if (!NodeTypeEnum.JAVA.getCode().equals(waitingTask.getJobType())) {
                 if (StringUtils.isNotEmpty(waitingTask.getRunParam())) {
-
-                    RunParamWrapped runParamWrapped = JSON.parseObject(waitingTask.getRunParam(), RunParamWrapped.class);
                     String param = PlaceholderUtils.paramPlaceholder(runParamWrapped.getPrivateParam(), repeatTime);
                     //设置替换完成后的参数
                     runParamWrapped.setPrivateParam(param);
-                    param = JSON.toJSONString(runParamWrapped);
-                    //设置参数
-                    waitingTask.setRunParam(param);
                 }
                 //获取原始命令
                 String runCommand = waitingTask.getRunCommand();
@@ -191,6 +187,7 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
                 waitingTask.setRunCommand(replaceRunCommand);
 
             }
+            waitingTask.setRunParam(JSON.toJSONString(runParamWrapped));
             return waitingTask;
         }).collect(Collectors.toList());
     }
@@ -202,10 +199,10 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
      * @param nodeRelyDtoSet 节点集合
      * @return 全部的节点信息
      */
-    private List<WaitingTask> buildWaitingTaskResult(List<WaitingRecord> waitingRecords, Set<NodeRelyDto> nodeRelyDtoSet) {
+    private List<WaitingTask> buildWaitingTaskResult(List<WaitingRecord> waitingRecords, Set<NodeRelyDto> nodeRelyDtoSet, Map<String,String> publicParam) {
         List<WaitingTask> waitingTaskListResult = new ArrayList<>(8);
         waitingRecords.forEach(waitingRecord -> {
-            List<WaitingTask> waitingTaskList = buildWaitingTask(waitingRecord, nodeRelyDtoSet);
+            List<WaitingTask> waitingTaskList = buildWaitingTask(waitingRecord, nodeRelyDtoSet,publicParam);
             waitingTaskListResult.addAll(waitingTaskList);
         });
         return waitingTaskListResult;