joylink
/
rts-sim-testing-service
6
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

门控箱相关继电器不再能直接控制屏蔽门，而是被联锁采集后由联锁发起控制；MPJ和JXTCPLJ改为仅供联锁采集

This commit is contained in:
thesai 2024-02-18 18:26:13 +08:00
parent e077147c8d
commit ef05b8a253
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
message_server/psl_ms.go
View File

@ -45,7 +45,8 @@ func collectGateBoxPSLState(world ecs.World, mapId int32, box *data_proto.GatedB
for _, button := range pslStorage.PslButtons { for _, button := range pslStorage.PslButtons {
btnUidMap[boxUid+"_"+button.Code] = memory.GetMapElementId(button.Common) btnUidMap[boxUid+"_"+button.Code] = memory.GetMapElementId(button.Common)
} }
btnArr := []*ecs.Entry{mkx.PCB, mkx.POB, mkx.PAB} btnArr := []*ecs.Entry{mkx.PCB, mkx.PCBPL, mkx.POB, mkx.POBPL, mkx.PAB, mkx.PABPL, mkx.WRZF, mkx.WRZFPL,
mkx.QKQR, mkx.QKQRPL, mkx.MPL, mkx.JXTCPL}
for _, btn := range btnArr { for _, btn := range btnArr {
if btn == nil { if btn == nil {
continue continue

28
ts/simulation/wayside/memory/wayside_simulation.go
View File

@ -814,6 +814,10 @@ func buildAndRelateElectronicComponent(repo *proto.Repository, relayGi *data_pro
mkx.PobjId = relay.Id mkx.PobjId = relay.Id
} else if strings.Contains(relay.GetCode(), "PAB") || strings.Contains(relay.GetCode(), "PDB") { } else if strings.Contains(relay.GetCode(), "PAB") || strings.Contains(relay.GetCode(), "PDB") {
mkx.PabjId = relay.Id mkx.PabjId = relay.Id
} else if strings.Contains(relay.GetCode(), "WRZF") {
mkx.WrzfjId = relay.Id
} else if strings.Contains(relay.GetCode(), "QKQR") {
mkx.QkqrjId = relay.Id
} }
} }
} }
@ -1214,11 +1218,29 @@ func fillProtoRepository(repo *proto.Repository, storage *data_proto.RtssGraphic
repo.Buttons = append(repo.Buttons, repoButton) repo.Buttons = append(repo.Buttons, repoButton)
switch button.Code { switch button.Code {
case "PCB": case "PCB":
mkx.PcbButtonId = repoButton.Id mkx.PcbaId = repoButton.Id
case "PCBPL":
mkx.PcbplaId = repoButton.Id
case "POB": case "POB":
mkx.PobButtonId = repoButton.Id mkx.PobaId = repoButton.Id
case "POBPL":
mkx.PobplaId = repoButton.Id
case "PAB": case "PAB":
mkx.PabButtonId = repoButton.Id mkx.PabaId = repoButton.Id
case "PABPL":
mkx.PabplaId = repoButton.Id
case "WRZF":
mkx.WrzfaId = repoButton.Id
case "WRZFPL":
mkx.WrzfplaId = repoButton.Id
case "QKQR":
mkx.QkqraId = repoButton.Id
case "QKQRPL":
mkx.QkqrplaId = repoButton.Id
case "MPL":
mkx.MplaId = repoButton.Id
case "JXTCPL":
mkx.JxtcplaId = repoButton.Id
} }
} }
} }