diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/data/CtcStationRunPlan.java b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/data/CtcStationRunPlanLog.java similarity index 87% rename from src/main/java/club/joylink/rtss/simulation/cbtc/CTC/data/CtcStationRunPlan.java rename to src/main/java/club/joylink/rtss/simulation/cbtc/CTC/data/CtcStationRunPlanLog.java index 07bdff2cd..ea760170a 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/data/CtcStationRunPlan.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/CTC/data/CtcStationRunPlanLog.java @@ -3,7 +3,6 @@ package club.joylink.rtss.simulation.cbtc.CTC.data; import club.joylink.rtss.simulation.cbtc.data.map.Section; import club.joylink.rtss.simulation.cbtc.data.map.Station; import club.joylink.rtss.simulation.cbtc.data.map.StationDirection; -import club.joylink.rtss.simulation.cbtc.data.plan.StationPlan; import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -15,10 +14,10 @@ import java.util.List; import java.util.Map; /** - * Ctc 车站运行计划 + * Ctc 车站运行计划日志 */ @Data -public class CtcStationRunPlan { +public class CtcStationRunPlanLog { /** * 所属车站 */ @@ -72,7 +71,43 @@ public class CtcStationRunPlan { @Setter @Getter public class RunPlanItem { - private StationPlan stationPlan; + /** + * 服务号 + */ + private String serviceNumber; + + /** + * 车次号 + */ + private String tripNumber; + + /** + * 是否向右行驶 + */ + private boolean right; + + /** + * 计划到达时刻 + */ + private LocalTime arriveTime; + + /** + * 计划出发时刻 + */ + private LocalTime leaveTime; + + /** + * 是否停车 + */ + private boolean park; + + /** + * 计划停车时长 + */ + private int parkTime; + + + private boolean finished; /** * 实际到达时间