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

【修改实训加载BUG】

Browse Source
This commit is contained in:
weizhihong 2022-08-29 09:37:59 +08:00
parent a94b1ac3b0
commit 12dc16c0b5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/club/joylink/rtss/simulation/cbtc/training2/Training2.java
View File

@ -98,15 +98,15 @@ public class Training2 {
this.playerIds = JsonUtils.readCollection(draftTraining2.getPlayerIdJson(), List.class, String.class); this.playerIds = JsonUtils.readCollection(draftTraining2.getPlayerIdJson(), List.class, String.class);
} }
labels = JsonUtils.readCollection(draftTraining2.getLabelJson(), List.class, String.class); labels = JsonUtils.readCollection(draftTraining2.getLabelJson(), List.class, String.class);
if (StringUtils.isEmpty(draftTraining2.getOperaJson())) { if (!StringUtils.isEmpty(draftTraining2.getOperaJson())) {
List<Operation2VO> operation2VOS = JsonUtils.readCollection(draftTraining2.getOperaJson(), List.class, Operation2VO.class); List<Operation2VO> operation2VOS = JsonUtils.readCollection(draftTraining2.getOperaJson(), List.class, Operation2VO.class);
operations = operation2VOS.stream().map(vo -> vo.convert2BO(simulation)).collect(Collectors.toList()); operations = operation2VOS.stream().map(vo -> vo.convert2BO(simulation)).collect(Collectors.toList());
} }
if (StringUtils.isEmpty(draftTraining2.getStepJson())) { if (!StringUtils.isEmpty(draftTraining2.getStepJson())) {
List<Step2VO> step2VOS = JsonUtils.readCollection(draftTraining2.getStepJson(), List.class, Step2VO.class); List<Step2VO> step2VOS = JsonUtils.readCollection(draftTraining2.getStepJson(), List.class, Step2VO.class);
steps = step2VOS.stream().map(vo -> new Step2(vo, simulation)).collect(Collectors.toList()); steps = step2VOS.stream().map(vo -> new Step2(vo, simulation)).collect(Collectors.toList());
} }
if (StringUtils.isEmpty(draftTraining2.getScoringRuleJson())) { if (!StringUtils.isEmpty(draftTraining2.getScoringRuleJson())) {
List<ScoringRuleVO> scoringRuleVOS = JsonUtils.readCollection(draftTraining2.getScoringRuleJson(), List.class, ScoringRuleVO.class); List<ScoringRuleVO> scoringRuleVOS = JsonUtils.readCollection(draftTraining2.getScoringRuleJson(), List.class, ScoringRuleVO.class);
scoringRules = scoringRuleVOS.stream().map(vo -> vo.convert2BO(simulation, this)).collect(Collectors.toList()); scoringRules = scoringRuleVOS.stream().map(vo -> vo.convert2BO(simulation, this)).collect(Collectors.toList());
} }
@ -165,6 +165,7 @@ public class Training2 {
/** /**
* 打分 * 打分
*
* @return k-memberId v-分数 * @return k-memberId v-分数
*/ */
public Map<String, Float> mark() { public Map<String, Float> mark() {