修改流程模版关联工况库多个版本工况bug
This commit is contained in:
@@ -122,7 +122,6 @@ public class FlowServiceImpl extends BaseService implements IFlowService {
|
|||||||
}
|
}
|
||||||
req.bindTaskkPoolItem.add(bindTaskPoolItem);
|
req.bindTaskkPoolItem.add(bindTaskPoolItem);
|
||||||
}
|
}
|
||||||
|
|
||||||
simuluationTaskPoolFeignClient.updateTaskAndFlowTemplate(req);
|
simuluationTaskPoolFeignClient.updateTaskAndFlowTemplate(req);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -358,7 +357,27 @@ public class FlowServiceImpl extends BaseService implements IFlowService {
|
|||||||
if(bindResponse.isSuccess())
|
if(bindResponse.isSuccess())
|
||||||
{
|
{
|
||||||
List<FlowBindTaskPoolItem> flowBindTaskPoolItems = (List<FlowBindTaskPoolItem>)bindResponse.getData();
|
List<FlowBindTaskPoolItem> flowBindTaskPoolItems = (List<FlowBindTaskPoolItem>)bindResponse.getData();
|
||||||
|
//过滤出工况库中最新的版本对流程模版的绑定关系
|
||||||
|
Map<String,FlowBindTaskPoolItem> latestPoolBindRelateMap = new HashMap<>();
|
||||||
for(FlowBindTaskPoolItem flowBindTaskPoolItem : flowBindTaskPoolItems)
|
for(FlowBindTaskPoolItem flowBindTaskPoolItem : flowBindTaskPoolItems)
|
||||||
|
{
|
||||||
|
String poolName = flowBindTaskPoolItem.poolName;
|
||||||
|
String version = flowBindTaskPoolItem.version;
|
||||||
|
FlowBindTaskPoolItem savedPoolItem = latestPoolBindRelateMap.get(poolName);
|
||||||
|
if(savedPoolItem == null)
|
||||||
|
{
|
||||||
|
latestPoolBindRelateMap.put(poolName,flowBindTaskPoolItem);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
String savedVersion = savedPoolItem.version;
|
||||||
|
if(version.compareTo(savedVersion) > 0)
|
||||||
|
{
|
||||||
|
latestPoolBindRelateMap.put(poolName,flowBindTaskPoolItem);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for(FlowBindTaskPoolItem flowBindTaskPoolItem : latestPoolBindRelateMap.values())
|
||||||
{
|
{
|
||||||
SimulationFlowTaskBindInfo flowTaskBindInfo = new SimulationFlowTaskBindInfo();
|
SimulationFlowTaskBindInfo flowTaskBindInfo = new SimulationFlowTaskBindInfo();
|
||||||
flowTaskBindInfo.simulationPoolName = flowBindTaskPoolItem.poolName;
|
flowTaskBindInfo.simulationPoolName = flowBindTaskPoolItem.poolName;
|
||||||
|
|||||||
Reference in New Issue
Block a user