Commit 1c19de82 by huangfu

修改内存溢出的BUG

parent e5cc550c
...@@ -141,7 +141,7 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService { ...@@ -141,7 +141,7 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
} }
if (CollectionUtil.isNotEmpty(nodeRelyDtoSet)) { if (CollectionUtil.isNotEmpty(nodeRelyDtoSet)) {
//构建等待队列 //构建等待队列
List<WaitingRecord> waitingRecords = buildWaitingRecordList(flowByName, nodeRelyDtoSet.size(), operator, repairTimeList, JSON.toJSONString(newPublicParam)); List<WaitingRecord> waitingRecords = buildWaitingRecordList(flowByName, nodeRelyDtoSet.size(), operator, repairTimeList, newPublicParam);
waitingRecords.forEach(waitingRecordMapper::insertSelective); waitingRecords.forEach(waitingRecordMapper::insertSelective);
List<RunRecording> runRecordings = buildRunRecordingList(waitingRecords); List<RunRecording> runRecordings = buildRunRecordingList(waitingRecords);
List<WaitingTask> waitingTaskList = buildWaitingTaskResult(waitingRecords, nodeRelyDtoSet, specialJobParam.getPublicParam(), timeFormatName, nowTimeFormatName); List<WaitingTask> waitingTaskList = buildWaitingTaskResult(waitingRecords, nodeRelyDtoSet, specialJobParam.getPublicParam(), timeFormatName, nowTimeFormatName);
...@@ -287,21 +287,20 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService { ...@@ -287,21 +287,20 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
* @param repairTimeList 补时间 * @param repairTimeList 补时间
* @return 等待队列集合 * @return 等待队列集合
*/ */
private List<WaitingRecord> buildWaitingRecordList(Flow flow, Integer nodeCount, String operator, List<RepairTimeParam> repairTimeList, String publicParam) { private List<WaitingRecord> buildWaitingRecordList(Flow flow, Integer nodeCount, String operator, List<RepairTimeParam> repairTimeList, Map<String,String> publicParam) {
//查看当前排队的工作流最大排队序号 //查看当前排队的工作流最大排队序号
Integer order = waitingRecordMapper.findOrderByFlowId(flow.getFlowId()); Integer order = waitingRecordMapper.findOrderByFlowId(flow.getFlowId());
if (order == null) { if (order == null) {
order = 0; order = 0;
} }
//传递过来的公共参数格式化 //传递过来的公共参数格式化
Map<String,String> publicMap = JSON.parseObject(publicParam, Map.class); if(CollectionUtil.isEmpty(publicParam)){
if(CollectionUtil.isEmpty(publicMap)){ publicParam = new HashMap<>(8);
publicMap = new HashMap<>(8);
} }
List<WaitingRecord> waitingRecords = new ArrayList<>(2); List<WaitingRecord> waitingRecords = new ArrayList<>(2);
for (RepairTimeParam repairTimeParam : repairTimeList) { for (RepairTimeParam repairTimeParam : repairTimeList) {
publicMap.put(PlaceholderEnum.DATE_PLACEHOLDER.getName(),repairTimeParam.getRepairTime()); publicParam.put(PlaceholderEnum.DATE_PLACEHOLDER.getName(),repairTimeParam.getRepairTime());
publicMap.put(PlaceholderEnum.NOW_DATE_PLACEHOLDER.getName(),repairTimeParam.getRepairTime()); publicParam.put(PlaceholderEnum.NOW_DATE_PLACEHOLDER.getName(),repairTimeParam.getRepairTime());
String repeatTime = repairTimeParam.getRepairTime(); String repeatTime = repairTimeParam.getRepairTime();
String timeTypeName = repairTimeParam.getTimeTypeName(); String timeTypeName = repairTimeParam.getTimeTypeName();
WaitingRecord waitingRecord = new WaitingRecord(); WaitingRecord waitingRecord = new WaitingRecord();
...@@ -315,11 +314,11 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService { ...@@ -315,11 +314,11 @@ public class ApiFlowOperatingServiceImpl implements ApiFlowOperatingService {
if(flowPublicParamMap == null){ if(flowPublicParamMap == null){
flowPublicParamMap = new HashMap<>(); flowPublicParamMap = new HashMap<>();
} }
flowPublicParamMap.putAll(publicMap); flowPublicParamMap.putAll(publicParam);
flowExtendedConfiguration.setPublicParam(JSON.toJSONString(flowPublicParamMap)); flowExtendedConfiguration.setPublicParam(JSON.toJSONString(flowPublicParamMap));
} else { } else {
flowExtendedConfiguration = new FlowExtendedConfiguration(); flowExtendedConfiguration = new FlowExtendedConfiguration();
flowExtendedConfiguration.setPublicParam(JSON.toJSONString(publicMap)); flowExtendedConfiguration.setPublicParam(JSON.toJSONString(publicParam));
} }
waitingRecord.setExtendedConfiguration(JSON.toJSONString(flowExtendedConfiguration)); waitingRecord.setExtendedConfiguration(JSON.toJSONString(flowExtendedConfiguration));
waitingRecord.setFlowVersionName(flow.getVersionName()); waitingRecord.setFlowVersionName(flow.getVersionName());
......
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