diff --git a/ats/verify/simulation/wayside/memory/wayside_memory_map.go b/ats/verify/simulation/wayside/memory/wayside_memory_map.go
index c0a71a5..55e89ac 100644
--- a/ats/verify/simulation/wayside/memory/wayside_memory_map.go
+++ b/ats/verify/simulation/wayside/memory/wayside_memory_map.go
@@ -24,7 +24,7 @@ var (
 
 // 将发布的地图数据放入内存中
 func PublishMapVerifyStructure(graphic *model.PublishedGi) {
-	giTypeMap.Store(graphic.ID, graphic.Type)
+	giTypeMap.Store(graphic.ID, graphicData.PictureType(graphic.Type))
 	var message proto.Message
 	switch graphicData.PictureType(graphic.Type) {
 	case graphicData.PictureType_StationLayout:
diff --git a/ats/verify/simulation/wayside/memory/wayside_memory_map_init.go b/ats/verify/simulation/wayside/memory/wayside_memory_map_init.go
index 6359f0f..fbb3b36 100644
--- a/ats/verify/simulation/wayside/memory/wayside_memory_map_init.go
+++ b/ats/verify/simulation/wayside/memory/wayside_memory_map_init.go
@@ -148,7 +148,7 @@ func initRelayCabinetUid(graphicData *graphicData.RelayCabinetGraphicStorage) *r
 		rus.RelayCabinetIds[r.Common.Id] = &elementIdStructure{
 			CommonId: r.Common.Id,
 			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
diff --git a/ats/verify/simulation/wayside/memory/wayside_simulation.go b/ats/verify/simulation/wayside/memory/wayside_simulation.go
index 0ba82e4..1ce402d 100644
--- a/ats/verify/simulation/wayside/memory/wayside_simulation.go
+++ b/ats/verify/simulation/wayside/memory/wayside_simulation.go
@@ -104,7 +104,7 @@ func CreateSimulation(projectId int32, mapIds []int32) (*VerifySimulation, error
 	worldMemory := NewWaysideMemory()
 	initWorldDeviceState(worldMemory.Status, repo)
 	//创建仿真
-	worldId := simulation.CreateSimulation(repo, system.SWITCH_ZDJ9_2)
+	worldId := simulation.CreateSimulation(repo, system.SWITCH_ZDJ9_2, system.RELAY)
 	verifySimulation := &VerifySimulation{
 		MapIds:    mapIds,
 		ProjectId: projectId,
@@ -160,10 +160,10 @@ func buildProtoRepository(mapIds []int32) (*proto.Repository, error) {
 }
 
 func relateRelay(repo *proto.Repository, relayGi *graphicData.RelayCabinetGraphicStorage, mapId int32) {
+	uidsMap := queryUidStructure[*relayUidStructure](mapId)
 	city := relayGi.UniqueIdPrefix.City
 	lineId := relayGi.UniqueIdPrefix.LineId
 	station := relayGi.UniqueIdPrefix.BelongsConcentrationStation
-	uidsMap := queryUidStructure[*relayUidStructure](mapId)
 	for _, relay := range relayGi.Relays {
 		repo.Relays = append(repo.Relays, &proto.Relay{
 			Id:    uidsMap.RelayIds[relay.Common.Id].Uid,
diff --git a/bj-rtss-message b/bj-rtss-message
index 38b3c74..0495b44 160000
--- a/bj-rtss-message
+++ b/bj-rtss-message
@@ -1 +1 @@
-Subproject commit 38b3c74776533bdbab6c2a93ffa7926473fb2e66
+Subproject commit 0495b44dfcf2cb509e7952b97afb9055931994e4
diff --git a/rtss_simulation b/rtss_simulation
index 36cb781..026b04e 160000
--- a/rtss_simulation
+++ b/rtss_simulation
@@ -1 +1 @@
-Subproject commit 36cb781ac272fd82e53fb2a025f4d8efbdca441e
+Subproject commit 026b04e539d3369f672a45a8d6e4cc4383929498