diff --git a/protos/device_state.proto b/protos/device_state.proto index fb3e08d..eb48e86 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -236,6 +236,8 @@ message SimulationStatus { int32 mapId = 2; int32 projectId = 3; + + repeated int32 mapIds = 4; } // 变更信息状态 diff --git a/protos/relayCabinetLayoutGraphics.proto b/protos/relayCabinetLayoutGraphics.proto index 8fa9f9a..dda8785 100644 --- a/protos/relayCabinetLayoutGraphics.proto +++ b/protos/relayCabinetLayoutGraphics.proto @@ -9,7 +9,8 @@ message RelayCabinetGraphicStorage { repeated RelayCabinet relayCabinets = 2; repeated Relay relays = 3; repeated DeviceRelateRelay deviceRelateRelayList = 4; - string belongsConcentrationStation = 5;//继电器柜图所属集中站 + //string belongsConcentrationStation = 5;//继电器柜图所属集中站 + UniqueIdType UniqueIdPrefix = 6;//设备唯一编码--前缀 } message RelayCabinet { @@ -31,7 +32,13 @@ message DeviceRelateRelay { //repeated string refRelay = 4;//设备关联的继电器 repeated Combinationtype combinationtypes = 5; //组合类型 } -message Combinationtype{ +message Combinationtype { string code = 1; repeated string refRelays = 2;//设备关联的继电器 } + +message UniqueIdType { + string city = 1;//城市 + string lineId = 2;//线路号 + string belongsConcentrationStation = 3;//继电器柜图所属集中站 +} diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index fbe9c07..bb3ea1d 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -35,6 +35,8 @@ message RtssGraphicStorage { repeated Curvature curvatures = 27; // 曲度 repeated TrackSection trackSections = 28; //轨道区段 repeated TrackLogicSection trackLogicSections = 29; //轨道逻辑区段 + //UniqueIdType UniqueIdPrefix = 30;//设备唯一编码--前缀 + UniqueIdOfStationLayout UniqueIdPrefix = 31;//设备唯一编码--前缀 } message Canvas { @@ -148,7 +150,7 @@ message AxleCounting { repeated RelatedRef axleCountingRef = 4; // 计轴关联的非岔区物理区段和道岔,设备id和端口 int32 index = 5; //计轴的索引编号 - bool invent = 6; //是否虚拟计轴--一般是最末端 + //bool invent = 6; //是否虚拟计轴--一般是最末端 TypeDetectionPoint type = 7; //检测点的类型:计轴、区段边界 repeated string centralizedStations = 8; // 集中站列表 } @@ -427,3 +429,8 @@ message CalculateLink { string deviceType = 3; } } + +message UniqueIdOfStationLayout { + string city = 1;//城市 + string lineId = 2;//线路号 +}