Commit ab142f54 by huangfusuper

处理只有子流的情况

parent d775189e
...@@ -206,33 +206,33 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService { ...@@ -206,33 +206,33 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
waitingTask.setScheduleType(ScheduleTypeEnum.REPAIR.getCode()); waitingTask.setScheduleType(ScheduleTypeEnum.REPAIR.getCode());
waitingTask.setWaitId(waitingRecord.getWaitId()); waitingTask.setWaitId(waitingRecord.getWaitId());
RunParamWrapped runParamWrapped = JSON.parseObject(waitingTask.getRunParam(), RunParamWrapped.class); // RunParamWrapped runParamWrapped = JSON.parseObject(waitingTask.getRunParam(), RunParamWrapped.class);
if (runParamWrapped == null) { // if (runParamWrapped == null) {
runParamWrapped = new RunParamWrapped(); // runParamWrapped = new RunParamWrapped();
} // }
runParamWrapped.setPublicParamMap(publicParam); // runParamWrapped.setPublicParamMap(publicParam);
//
try { // try {
SimpleDateFormat sdf = new SimpleDateFormat(timeFormat); // SimpleDateFormat sdf = new SimpleDateFormat(timeFormat);
Date repairDate = sdf.parse(repeatTime); // Date repairDate = sdf.parse(repeatTime);
ValidationUtil.isTrueValidation(!repairDate.before(new Date()), "只能补过去时间的批次!"); // ValidationUtil.isTrueValidation(!repairDate.before(new Date()), "只能补过去时间的批次!");
} catch (ParseException e) { // } catch (ParseException e) {
log.error("补批日期不符合规范,例:{}", timeFormat); // log.error("补批日期不符合规范,例:{}", timeFormat);
ValidationUtil.isTrueValidation(true, "补批日期不符合规范,例:" + timeFormat); // ValidationUtil.isTrueValidation(true, "补批日期不符合规范,例:" + timeFormat);
} // }
//
//补批只替换不是java的节点 // //补批只替换不是java的节点
if (!NodeTypeEnum.JAVA.getCode().equals(waitingTask.getJobType())) { // if (!NodeTypeEnum.JAVA.getCode().equals(waitingTask.getJobType())) {
if (StringUtils.isNotEmpty(waitingTask.getRunParam())) { // if (StringUtils.isNotEmpty(waitingTask.getRunParam())) {
//
String param = PlaceholderUtils.formatBizDateParam(runParamWrapped.getPrivateParam(), PlaceholderEnum.DATE_PLACEHOLDER.getName(), repeatTime, 0); // String param = PlaceholderUtils.formatBizDateParam(runParamWrapped.getPrivateParam(), PlaceholderEnum.DATE_PLACEHOLDER.getName(), repeatTime, 0);
String dateFormat = DateUtil.dateFormat(new Date(), nowDateFormat); // String dateFormat = DateUtil.dateFormat(new Date(), nowDateFormat);
param = PlaceholderUtils.formatBizDateParam(param, PlaceholderEnum.NOW_DATE_PLACEHOLDER.getName(), dateFormat, 0); // param = PlaceholderUtils.formatBizDateParam(param, PlaceholderEnum.NOW_DATE_PLACEHOLDER.getName(), dateFormat, 0);
//设置替换完成后的参数 // //设置替换完成后的参数
runParamWrapped.setPrivateParam(param); // runParamWrapped.setPrivateParam(param);
} // }
} // }
waitingTask.setRunParam(JSON.toJSONString(runParamWrapped)); // waitingTask.setRunParam(JSON.toJSONString(runParamWrapped));
return waitingTask; return waitingTask;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment