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 2022-06-20 18:01:16 +08:00
commit 76d9a0efbd
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/club/joylink/rtss/simulation/cbtc/CTC/CTCService.java
View File

@ -10,10 +10,9 @@ import club.joylink.rtss.simulation.cbtc.data.map.Route;
import club.joylink.rtss.simulation.cbtc.data.map.Station; import club.joylink.rtss.simulation.cbtc.data.map.Station;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import java.time.LocalTime; import java.time.LocalTime;
import java.util.Objects; import java.time.format.DateTimeFormatter;
@Component @Component
public class CTCService { public class CTCService {
@ -98,8 +97,9 @@ public class CTCService {
CtcStationRunPlanLog previousStationPlan = getCtcStationRunPlanByRunPlanCode(simulation, previousStation.getCode(), runPlanCode); CtcStationRunPlanLog previousStationPlan = getCtcStationRunPlanByRunPlanCode(simulation, previousStation.getCode(), runPlanCode);
currentStationPlan.finishReceivingNotice(); currentStationPlan.finishReceivingNotice();
previousStationPlan.finishDepartureNotice(); previousStationPlan.finishDepartureNotice();
currentStationPlan.getArriveRunPlan().setAdjacentMessageTime(simulation.getSystemTime().toString()); String systemTime = simulation.getCorrectSystemTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:dd"));
previousStationPlan.getDepartRunPlan().setAdjacentMessageTime(simulation.getSystemTime().toString()); currentStationPlan.getArriveRunPlan().setAdjacentMessageTime(systemTime);
previousStationPlan.getDepartRunPlan().setAdjacentMessageTime(systemTime);
} }
/** /**

1
src/main/java/club/joylink/rtss/simulation/cbtc/CTC/data/CtcStationRunPlanLog.java
View File

@ -365,6 +365,7 @@ public class CtcStationRunPlanLog {
this.adjacentDepart = null; this.adjacentDepart = null;
this.adjacentMessage = NO; this.adjacentMessage = NO;
this.occupiedCode = null; this.occupiedCode = null;
this.adjacentMessageTime = null;
this.trainTypeMap.clear(); this.trainTypeMap.clear();
this.processTypeMap.clear(); this.processTypeMap.clear();