diff --git a/bj-rtss-message b/bj-rtss-message index 126ba5a..3a30efc 160000 --- a/bj-rtss-message +++ b/bj-rtss-message @@ -1 +1 @@ -Subproject commit 126ba5a7619f6c55f893683dd5a0a86a30b25bec +Subproject commit 3a30efc9fe949cd5ab9898073f00a093716f279e diff --git a/ts/simulation/wayside/memory/wayside_memory_transponder.go b/ts/simulation/wayside/memory/wayside_memory_transponder.go index bcef42d..fa6ba65 100644 --- a/ts/simulation/wayside/memory/wayside_memory_transponder.go +++ b/ts/simulation/wayside/memory/wayside_memory_transponder.go @@ -165,7 +165,8 @@ func BaliseTelegramReset(simulation *VerifySimulation, req *dto.BaliseReqDto) er func baliseTelegramReset(simulation *VerifySimulation, balise *repository.Transponder) error { entry, _ := entity.GetEntityByUid(simulation.World, balise.Id()) component.BaliseFixedTelegramType.SetValue(entry, component.BaliseState{ - Telegram: balise.FixedTelegram(), + Telegram: balise.FixedTelegram(), + UserTelegram: balise.FixedUserTelegram(), }) return nil } diff --git a/ts/simulation/wayside/memory/wayside_simulation.go b/ts/simulation/wayside/memory/wayside_simulation.go index 9e95558..6d0c898 100644 --- a/ts/simulation/wayside/memory/wayside_simulation.go +++ b/ts/simulation/wayside/memory/wayside_simulation.go @@ -381,7 +381,7 @@ func (s *VerifySimulation) HandleSemiPhysicalTrainControlMsg(b []byte) { s.Memory.Status.TrainStateMap.Range(func(_, value any) bool { train := value.(*state_proto.TrainState) if !train.Show { // 下线列车 - return false + return true } trainId, err := strconv.Atoi(train.Id) if err != nil {