Merge remote-tracking branch 'origin/develop-many-instance' into develop-many-instance

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

@@ -3,6 +3,7 @@ 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.alibaba.fastjson.JSONObject;
 import com.byit.dto.BeanStrategyPackage;
 import com.byit.dto.plugin.FlowExtendedConfiguration;
 import com.byit.enums.*;
@@ -85,6 +86,23 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
         String extendedConfiguration = virFlow.getExtendedConfiguration();
         //格式化扩展配置
         FlowExtendedConfiguration flowExtendedConfiguration = JSON.parseObject(extendedConfiguration, FlowExtendedConfiguration.class);
+
+        RunRecording runRecordingByFlowIdAndRunId = runRecordingService.findRunRecordingByFlowIdAndRunId(mainFlow.getFlowId(), jobTask.getRunId());
+        //父工作流公共参数
+        String mainExtendedConfiguration = runRecordingByFlowIdAndRunId.getExtendedConfiguration();
+        //父工作流格式化扩展配置
+        FlowExtendedConfiguration mainFlowExtendedConfiguration = JSON.parseObject(mainExtendedConfiguration, FlowExtendedConfiguration.class);
+        //父工作流公共参数
+        String mainPublicParam = mainFlowExtendedConfiguration.getPublicParam();
+        JSONObject mainParamMap = JSON.parseObject(mainPublicParam);
+        //子工作流公共参数
+        String publicParam = flowExtendedConfiguration.getPublicParam();
+        JSONObject childParamMap = JSON.parseObject(publicParam);
+        if(CollectionUtil.isNotEmpty(mainParamMap)) {
+            mainParamMap.forEach(childParamMap::put);
+        }
+        flowExtendedConfiguration.setPublicParam(JSON.toJSONString(childParamMap));
+
         String hasManyInstance = flowExtendedConfiguration.getHasManyInstance();
         //如果虚节点设置为不支持多实例
         if (FlowPropertyEnum.NOT_MANY_INSTANCE.getCode().equals(hasManyInstance)) {
@@ -147,7 +165,7 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
                 .failFast(RunRecordingEnum.FAIL_FAST_NO.getCode())
                 .workspaceId(virFlow.getWorkspaceId())
                 .repeatTime(mainRecording.getRepeatTime())
-                .extendedConfiguration(extendedConfiguration)
+                .extendedConfiguration(JSON.toJSONString(flowExtendedConfiguration))
                 .build();
         if(repair) {
             runRecording.setTriggerTime(mainRecording.getTriggerTime());