From c27ef7c6755ad88a74f382a4d7b3db868a802474 Mon Sep 17 00:00:00 2001 From: walker Date: Wed, 10 Jan 2024 11:17:32 +0800 Subject: [PATCH] =?UTF-8?q?merge=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ts/simulation/wayside/memory/wayside_memory_map_init.go | 2 +- ts/simulation/wayside/memory/wayside_memory_transponder.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ts/simulation/wayside/memory/wayside_memory_map_init.go b/ts/simulation/wayside/memory/wayside_memory_map_init.go index d24efe4..feac9d7 100644 --- a/ts/simulation/wayside/memory/wayside_memory_map_init.go +++ b/ts/simulation/wayside/memory/wayside_memory_map_init.go @@ -538,7 +538,7 @@ func initIBPUid(data *graphicData.IBPGraphicStorage) *IBPUidStructure { // 构建仿真内所有地图UID映射信号布置图ID,这里为了解决多地图时根据UID反向寻找，避免多次循环地图，直接获取平面布置图元素 func buildRepositoryAllUidsMap(mapIds []int32, repo *repository.Repository) map[string]*elementIdStructure { mapLen := len(repo.CheckPointList()) + len(repo.PhysicalSectionList()) + len(repo.SignalList()) + - len(repo.TurnoutList()) + len(repo.TransponderList()) + len(repo.SlopeList()) + + len(repo.TurnoutList()) + len(repo.ResponderList()) + len(repo.SlopeList()) + len(repo.SectionalCurvatureList()) allUidMap := make(map[string]*elementIdStructure, mapLen) saveToAllUidMap := func(es map[uint32]*elementIdStructure) { diff --git a/ts/simulation/wayside/memory/wayside_memory_transponder.go b/ts/simulation/wayside/memory/wayside_memory_transponder.go index a65379d..f53aca8 100644 --- a/ts/simulation/wayside/memory/wayside_memory_transponder.go +++ b/ts/simulation/wayside/memory/wayside_memory_transponder.go @@ -2,10 +2,11 @@ package memory import ( "fmt" + "joylink.club/bj-rtsts-server/dto" "joylink.club/bj-rtsts-server/sys_error" "joylink.club/rtsssimulation/component" - "joylink.club/rtsssimulation/component/component_proto" + "joylink.club/rtsssimulation/component/component_data" "joylink.club/rtsssimulation/entity" ) @@ -22,7 +23,7 @@ func TransponderMove(simulation *VerifySimulation, req *dto.TransponderMoveReqDt if !ok { panic(sys_error.New(fmt.Sprintf("没有[id:%s]的应答器", req.TransponderId))) } - component.LinkPositionType.SetValue(te, component_proto.LinkPosition{ + component.LinkPositionType.SetValue(te, component_data.LinkPosition{ LinkId: req.LinkId, Offset: req.Offset, })