diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 220cf5f..802f002 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -32,7 +32,9 @@ message RtssGraphicStorage { repeated CalculateLink CalculateLink = 24; // 计算link信息 repeated SlopeKiloMarker slopeKiloMarker = 25; //坡度公里标 repeated CurvatureKiloMarker curvatureKiloMarker = 26; //曲度公里标 - repeated Curvature curvatures = 27; // 曲度 + repeated Curvature curvatures = 27; // 曲度 + repeated TrackSection trackSections = 28; //轨道区段 + repeated TrackLogicSection trackLogicSections = 29; //轨道逻辑区段 } message Canvas { @@ -166,6 +168,9 @@ message Turnout { //(后端不关注) // KilometerSystem kilometerSystem = 12; // 道岔公里标 repeated KilometerSystem kilometerSystem = 13; // 道岔公里标 int32 index = 14; //索引 + string paTrackSectionId = 15; // A端轨道区段id + string pbTrackSectionId = 16; // B端轨道区段id + string pcTrackSectionId = 17; // C端轨道区段id } /** 左右行 **/ @@ -206,6 +211,7 @@ message Section { SectionType sectionType = 6; // 区段类型 repeated string axleCountings = 7; // 区段对应的计轴 int32 index = 8; // 索引 + string trackSectionId = 9; // 下属轨道区段id } //关联设备 @@ -264,9 +270,12 @@ message SectionLink { string code = 2; repeated Point points = 3; bool up = 4; // 是否上行 - SimpleRef aSimRef = 5; // SectionLink A端连接设备(构建关系 AxleCounting/Turnout) //端点 - SimpleRef bSimRef = 6; // SectionLink B端连接设备(构建关系 AxleCounting/Turnout) //端点 - RelatedRef aRef = 7; // SectionLink A端连接设备(端口关系 SectionLink/Turnout) + SimpleRef aSimRef = + 5; // SectionLink A端连接设备(构建关系 AxleCounting/Turnout) //端点 + SimpleRef bSimRef = + 6; // SectionLink B端连接设备(构建关系 AxleCounting/Turnout) //端点 + RelatedRef aRef = + 7; // SectionLink A端连接设备(端口关系 SectionLink/Turnout) RelatedRef bRef = 8; // SectionLink B端连接设备(端口关系 // SectionLink/Turnout) int32 index = 9; // 索引编号 @@ -292,6 +301,28 @@ message LogicSection { // 逻辑区段 6; // 关联的岔芯对应的道岔id,此时该逻辑区段为该道岔C端关联的轨道link } +message TrackSection { //轨道区段 + enum TrackSectionType { + NORMAL = 0; //非岔区 + FORK = 1; //岔区 + } + CommonInfo common = 1; + repeated Point points = 2; + string code = 3; //名称 + int32 index = 4; //索引 + TrackSectionType type = 5; //类型 + string destinationCode = 6; //目的地码 + repeated string trackLogicSection = 7; //下属的逻辑区段id(非岔区) + // //关联的物理设备id(物理区段/道岔)由另一端(物理区段/道岔处理) +} + +message TrackLogicSection { //轨道逻辑区段 + CommonInfo common = 1; + repeated Point points = 2; + string code = 3; //名称 + int32 length = 4; //长度(mm) +} + message StopPosition { enum CoachNum { Four = 0; @@ -354,7 +385,7 @@ message Slope { message Curvature { CommonInfo common = 1; repeated Point points = 2; - sint32 curvatureNumber = 3; //曲线的半径--正代表外侧;负代表内侧 + sint32 curvatureNumber = 3; //曲线的半径--正代表外侧;负代表内侧 repeated string refDeviceId = 4; // 曲线关联的(曲度公里标) } @@ -366,7 +397,7 @@ message CalculateLink { RelatedRef aRelatedRef = 4; // A端(最小端)关联的端点 RelatedRef bRelatedRef = 5; // B端(最大端)关联的端点 repeated DevicePosition devicePositions = 6; //设备在link上的位置 - int32 index = 7; //link唯一标识 + int32 index = 7; // link唯一标识 message DevicePosition { int32 offset = 1; string deviceId = 2;