joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

代码格式化

Browse Source
This commit is contained in:
joylink_zhangsai 2020-12-25 09:01:43 +08:00
parent db657689bf
commit f8abb9eddc
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/main/java/club/joylink/rtss/services/training/GenerateTask.java
View File

@ -124,37 +124,37 @@ public class GenerateTask {
@Transactional
public String generateNewTrainings(Long mapId, MapVO mapVO) {
log.warn("generate training start...[{}]", LocalTime.now());
// 查询通用运行图
RunPlanVO planVO = this.iRunPlanTemplateService.getFirstRunPlanByMapId(mapVO.getId());
this.delete(mapId);
GenerateConfig config = new GenerateConfig();
config.setMapId(mapId);
List<String> results = new ArrayList<>();
List<CommandDefinitionVO> commandDefinitions = iCommandService.queryDefinitionsByLineCode(mapVO.getLineCode());
Map<String, List<CommandDefinitionVO>> groupByPrdType = commandDefinitions.stream()
.collect(Collectors.groupingBy(CommandDefinitionVO::getPrdType));
groupByPrdType.forEach((r, cdr) -> {
config.setPrdType(r);
SimulationBuildParams params = SimulationBuildParams.builder()
.createTime(LocalDateTime.now())
.map(mapVO)
.prodType(MapPrdTypeEnum.getMapPrdTypeEnumByCode(config.getPrdType()))
.runPlan(planVO)
.build();
Simulation simulation = SimulationBuilder.build(params);
Map<String, List<CommandDefinitionVO>> groupByOperationObject = cdr.stream()
.collect(Collectors.groupingBy(CommandDefinitionVO::getOperateObject));
groupByOperationObject.forEach((o, cdo) -> {
config.setTrainingType(o);
config.setOperateType(cdo.stream().map(cd -> cd.getOperate()).collect(Collectors.toList()));
List<String> list = this.generateNew(config, mapVO, simulation);
if (!CollectionUtils.isEmpty(list)) {
results.addAll(list);
}
});
// 查询通用运行图
RunPlanVO planVO = this.iRunPlanTemplateService.getFirstRunPlanByMapId(mapVO.getId());
this.delete(mapId);
GenerateConfig config = new GenerateConfig();
config.setMapId(mapId);
List<String> results = new ArrayList<>();
List<CommandDefinitionVO> commandDefinitions = iCommandService.queryDefinitionsByLineCode(mapVO.getLineCode());
Map<String, List<CommandDefinitionVO>> groupByPrdType = commandDefinitions.stream()
.collect(Collectors.groupingBy(CommandDefinitionVO::getPrdType));
groupByPrdType.forEach((r, cdr) -> {
config.setPrdType(r);
SimulationBuildParams params = SimulationBuildParams.builder()
.createTime(LocalDateTime.now())
.map(mapVO)
.prodType(MapPrdTypeEnum.getMapPrdTypeEnumByCode(config.getPrdType()))
.runPlan(planVO)
.build();
Simulation simulation = SimulationBuilder.build(params);
Map<String, List<CommandDefinitionVO>> groupByOperationObject = cdr.stream()
.collect(Collectors.groupingBy(CommandDefinitionVO::getOperateObject));
groupByOperationObject.forEach((o, cdo) -> {
config.setTrainingType(o);
config.setOperateType(cdo.stream().map(cd -> cd.getOperate()).collect(Collectors.toList()));
List<String> list = this.generateNew(config, mapVO, simulation);
if (!CollectionUtils.isEmpty(list)) {
results.addAll(list);
}
});
log.warn("generate training end...[{}]", LocalTime.now());
return CollectionUtils.isEmpty(results) ? "成功" : String.join(",", results);
});
log.warn("generate training end...[{}]", LocalTime.now());
return CollectionUtils.isEmpty(results) ? "成功" : String.join(",", results);
}
@Async