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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
joylink_zhangsai 2021-01-26 13:18:17 +08:00
commit b678d3e103
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/club/joylink/rtss/services/runplan/RunPlanRoutingService.java
View File

@ -144,9 +144,7 @@ public class RunPlanRoutingService implements IRunPlanRoutingService {
if (!planRunlevelService.isExisted(l)) {
Section startSection = (Section) deviceMap.get(l.getStartSectionCode());
Section endSection = (Section) deviceMap.get(l.getEndSectionCode());
SectionPosition startPosition = new SectionPosition(startSection,startSection.getStopPointByDirection(l.getRight()));
SectionPosition endPosition = new SectionPosition(endSection,endSection.getStopPointByDirection(l.getRight()));
Float distance = CalculateService.calculateDistance(startPosition, endPosition, l.getRight());
Float distance = CalculateService.calculateDistance(startSection, endSection, l.getRight());
l.setDistance(distance);
l.generateDefaultRunLevel();
planRunlevelService.createUserRunlevel(l);

5
src/main/java/club/joylink/rtss/services/runplan/RunPlanRunlevelService.java
View File

@ -82,11 +82,10 @@ public class RunPlanRunlevelService implements IRunPlanRunlevelService {
list.forEach(l -> {
Section startSection = (Section) deviceMap.get(l.getStartSectionCode());
Section endSection = (Section) deviceMap.get(l.getEndSectionCode());
SectionPosition startPosition = new SectionPosition(startSection,startSection.getStopPointByDirection(l.getRight()));
SectionPosition endPosition = new SectionPosition(endSection,endSection.getStopPointByDirection(l.getRight()));
Float distance = CalculateService.calculateDistance(startPosition, endPosition, l.getRight());
Float distance = CalculateService.calculateDistance(startSection, endSection, l.getRight());
RunPlanRunlevel entity = new RunPlanRunlevel();
entity.setId(l.getId());
entity.setMapId(l.getMapId());
entity.setDistance(distance);
this.runPlanRunlevelDAO.updateByPrimaryKeySelective(entity);
r.put(l.getId(),distance);

4
src/main/java/club/joylink/rtss/simulation/cbtc/data/CalculateService.java
View File

@ -302,7 +302,9 @@ public class CalculateService {
if (Objects.isNull(distance)) {
throw new SimulationException(SimulationExceptionType.System_Fault, String.format("根据起始区段[%s(%s)]找不到对应方向(%s)的目标区段[%s(%s)]", startSection.getName(), startSection.getCode(), isRight ? "右向" : "左向", endSection.getName(), endSection.getCode()));
}
distance = distance - startSection.getLen() + endSection.getLen();
distance = isRight ?
distance - startSection.getStopPointByDirection(isRight) + endSection.getStopPointByDirection(isRight) :
distance - startSection.getLen() + startSection.getStopPointByDirection(isRight) + endSection.getLen()-endSection.getStopPointByDirection(isRight);
return distance;
}