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

Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtsts-server-go

Browse Source
This commit is contained in:
weizhihong 2023-09-25 11:10:26 +08:00
commit 43c3056afc
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ats/verify/simulation/wayside/memory/wayside_memory_map.go
View File

@ -24,7 +24,7 @@ var (
// 将发布的地图数据放入内存中 // 将发布的地图数据放入内存中
func PublishMapVerifyStructure(graphic *model.PublishedGi) { func PublishMapVerifyStructure(graphic *model.PublishedGi) {
giTypeMap.Store(graphic.ID, graphic.Type) giTypeMap.Store(graphic.ID, graphicData.PictureType(graphic.Type))
var message proto.Message var message proto.Message
switch graphicData.PictureType(graphic.Type) { switch graphicData.PictureType(graphic.Type) {
case graphicData.PictureType_StationLayout: case graphicData.PictureType_StationLayout:

2
ats/verify/simulation/wayside/memory/wayside_memory_map_init.go
View File

@ -148,7 +148,7 @@ func initRelayCabinetUid(graphicData *graphicData.RelayCabinetGraphicStorage) *r
rus.RelayCabinetIds[r.Common.Id] = &elementIdStructure{ rus.RelayCabinetIds[r.Common.Id] = &elementIdStructure{
CommonId: r.Common.Id, CommonId: r.Common.Id,
Code: r.Code, Code: r.Code,
Uid: GenerateElementUid(city, lineId, []string{station}, r.Code), Uid: GenerateElementUid(city, lineId, []string{station}, r.Common.Id),
} }
} }
// city+line+车站+设备code+继电器组合的code+继电器的code // city+line+车站+设备code+继电器组合的code+继电器的code

4
ats/verify/simulation/wayside/memory/wayside_simulation.go
View File

@ -105,7 +105,7 @@ func CreateSimulation(projectId int32, mapIds []int32) (*VerifySimulation, error
worldMemory := NewWaysideMemory() worldMemory := NewWaysideMemory()
initWorldDeviceState(worldMemory.Status, repo) initWorldDeviceState(worldMemory.Status, repo)
//创建仿真 //创建仿真
worldId := simulation.CreateSimulation(repo, system.SWITCH_ZDJ9_2) worldId := simulation.CreateSimulation(repo, system.SWITCH_ZDJ9_2, system.RELAY)
verifySimulation := &VerifySimulation{ verifySimulation := &VerifySimulation{
MapIds: mapIds, MapIds: mapIds,
ProjectId: projectId, ProjectId: projectId,
@ -161,10 +161,10 @@ func buildProtoRepository(mapIds []int32) (*proto.Repository, error) {
} }
func relateRelay(repo *proto.Repository, relayGi *graphicData.RelayCabinetGraphicStorage, mapId int32) { func relateRelay(repo *proto.Repository, relayGi *graphicData.RelayCabinetGraphicStorage, mapId int32) {
uidsMap := queryUidStructure[*relayUidStructure](mapId)
city := relayGi.UniqueIdPrefix.City city := relayGi.UniqueIdPrefix.City
lineId := relayGi.UniqueIdPrefix.LineId lineId := relayGi.UniqueIdPrefix.LineId
station := relayGi.UniqueIdPrefix.BelongsConcentrationStation station := relayGi.UniqueIdPrefix.BelongsConcentrationStation
uidsMap := queryUidStructure[*relayUidStructure](mapId)
for _, relay := range relayGi.Relays { for _, relay := range relayGi.Relays {
repo.Relays = append(repo.Relays, &proto.Relay{ repo.Relays = append(repo.Relays, &proto.Relay{
Id: uidsMap.RelayIds[relay.Common.Id].Uid, Id: uidsMap.RelayIds[relay.Common.Id].Uid,

2
bj-rtss-message

@ -1 +1 @@
Subproject commit 38b3c74776533bdbab6c2a93ffa7926473fb2e66 Subproject commit 0495b44dfcf2cb509e7952b97afb9055931994e4

2
rtss_simulation

@ -1 +1 @@
Subproject commit 36cb781ac272fd82e53fb2a025f4d8efbdca441e Subproject commit 026b04e539d3369f672a45a8d6e4cc4383929498