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

【bug】车库门操作、状态发送等逻辑中的bug

Browse Source
This commit is contained in:
thesai 2024-03-27 14:15:35 +08:00
parent 9d6acd9c20
commit ef9e431afd
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
message_server/sfp_ms.go
View File

@ -93,8 +93,10 @@ func collectCkmStates(world ecs.World, mapId int32) ([]*state_proto.CkmState, er
if ok { if ok {
circuit := component.CkmCircuitType.Get(entry) circuit := component.CkmCircuitType.Get(entry)
mgj := component.BitStateType.Get(circuit.MGJ).Val mgj := component.BitStateType.Get(circuit.MGJ).Val
ckmParam := appcomponent.CkmParamType.Get(entry) var ckmParam *request_proto.CkmParam
if ckmParam == nil { if entry.HasComponent(appcomponent.CkmParamType) {
ckmParam = appcomponent.CkmParamType.Get(entry)
} else {
ckmParam = &request_proto.CkmParam{} ckmParam = &request_proto.CkmParam{}
} }
stateLoss := entry.HasComponent(component.CkmStateLossTag) stateLoss := entry.HasComponent(component.CkmStateLossTag)

2
rts-sim-module

@ -1 +1 @@
Subproject commit d63be32ad560b64cf0f3306108064ed59b6f29e8 Subproject commit 33ed496dcd8697ad9d86077a0587140de49deee7

2
rts-sim-testing-message

@ -1 +1 @@
Subproject commit 8086bc2c8c61fe43878051544624aff69aaacbc2 Subproject commit f9034ba53d9b201140e9e43dbe8f5b8faa21633a

4
ts/simulation/wayside/memory/wayside_memory_map_init.go
View File

@ -670,6 +670,10 @@ func getUidMapByType(uidData any, m interface{}) map[uint32]*elementIdStructure
return (uidData.(*StationUidStructure)).PslIds return (uidData.(*StationUidStructure)).PslIds
case *data_proto.IbpBox: case *data_proto.IbpBox:
return (uidData.(*StationUidStructure)).IbpIds return (uidData.(*StationUidStructure)).IbpIds
case *data_proto.GarageDoorBox:
return (uidData.(*StationUidStructure)).PslIds
case *data_proto.GarageDoor:
return (uidData.(*StationUidStructure)).CkmIds
default: default:
panic(&dto.ErrorDto{Code: dto.ArgumentParseError, Message: "类型未映射字段"}) panic(&dto.ErrorDto{Code: dto.ArgumentParseError, Message: "类型未映射字段"})
} }