补批参数操作

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

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.byit.dto.StatisticsConditionDto;
 import com.byit.dto.api.DeleteDto;
 import com.byit.dto.executor.RunParamWrapped;
+import com.byit.dto.executor.ScriptParamAndPlaceholderDto;
 import com.byit.dto.plugin.*;
 import com.byit.dto.recording.LoadScheduleCondition;
 import com.byit.dto.specials.RepairFlow;
@@ -1330,7 +1331,16 @@ public class ApiFlowServiceImpl implements ApiFlowService {
                 waitingRecord.setScheduleType(ScheduleTypeEnum.REPAIR.getCode());
                 waitingRecord.setRepeatTime(repairTime);
                 waitingRecord.setWaitOrder(++order);
-                waitingRecord.setExtendedConfiguration(flow.getExtendedConfiguration());
+                String extendedConfiguration = flow.getExtendedConfiguration();
+                FlowExtendedConfiguration flowExtendedConfiguration = JSON.parseObject(extendedConfiguration, FlowExtendedConfiguration.class);
+                Map<String,String> publicParamMap = JSON.parseObject(flowExtendedConfiguration.getPublicParam(), Map.class);
+                if(CollectionUtil.isEmpty(publicParamMap)){
+                    publicParamMap = new HashMap<>(8);
+                }
+                publicParamMap.put(PlaceholderEnum.DATE_PLACEHOLDER.getName(), repairTime);
+                publicParamMap.put(PlaceholderEnum.NOW_DATE_PLACEHOLDER.getName(), repairTime);
+                flowExtendedConfiguration.setPublicParam(JSON.toJSONString(publicParamMap));
+                waitingRecord.setExtendedConfiguration(JSON.toJSONString(flowExtendedConfiguration));
                 //需要按着时间先后来设置时间
                 waitingRecord.setTriggerTime(System.currentTimeMillis());
                 //设置实例
@@ -1396,24 +1406,6 @@ public class ApiFlowServiceImpl implements ApiFlowService {
                 ValidationUtil.isTrueValidation(true, "补批日期不符合规范，例：" + timeFormatName);
             }
 
-            waitingTaskList.forEach(waitingTask -> {
-                //补批只替换不是java的节点
-                if (!NodeTypeEnum.JAVA.getCode().equals(waitingTask.getJobType())) {
-                    if (StringUtils.isNotEmpty(waitingTask.getRunParam())) {
-                        String runParamSource = waitingTask.getRunParam();
-                        RunParamWrapped runParamWrapped = JSON.parseObject(runParamSource, RunParamWrapped.class);
-                        //替换私有参数
-                        String param = PlaceholderUtils.formatBizDateParam(runParamWrapped.getPrivateParam(), PlaceholderEnum.DATE_PLACEHOLDER.getName(), repairTime, 0);
-                        String dateFormat = com.byit.job.utils.DateUtil.dateFormat(new Date(), nowDateTimeFormatName);
-                        param = PlaceholderUtils.formatBizDateParam(param, PlaceholderEnum.NOW_DATE_PLACEHOLDER.getName(), dateFormat, 0);
-                        runParamWrapped.setPrivateParam(param);
-                        param = JSON.toJSONString(runParamWrapped);
-                        waitingTask.setRunParam(param);
-                        waitingTask.setScheduleType(ScheduleTypeEnum.REPAIR.getCode());
-                    }
-                }
-                waitingTaskDateList.add(waitingTask);
-            });
             result.put(repairTime, waitingTaskDateList);
 
         }