diff --git a/protos/device_info.proto b/protos/device_info.proto index 0b4f0d8..3066fe0 100644 --- a/protos/device_info.proto +++ b/protos/device_info.proto @@ -12,17 +12,17 @@ message Section { // 区段编码 string code = 2; - // 区段类型 - graphicData.Section.SectionType type = 3; - // 关联区段 - repeated Section children = 4; + repeated string childrenId = 3; // 公里标 - repeated graphicData.KilometerSystem kilometerSystem = 5; + repeated graphicData.KilometerSystem kilometerSystem = 4; // 转换后的公里标数字 - repeated int64 convertKilometer = 7; + repeated int64 convertKilometer = 5; + + // 物理区段Id + string physicalSectionId = 6; } // 道岔 diff --git a/protos/device_status.proto b/protos/device_status.proto index 5e9a78b..99d71a9 100644 --- a/protos/device_status.proto +++ b/protos/device_status.proto @@ -101,14 +101,14 @@ message Switch { bool ipSingleSwitchStusReverse = 6; // 反位 bool ipSingleSwitchStusBlocked1 = 7; // 单锁 bool ipSingleSwitchStusJammed = 8; // 挤岔 - // bool ipSingleSwitchStusExpectLock = 9; // 期望锁闭 - // bool ipSingleSwitchStusExpectUnlock = 10; // 期望锁闭解除 - // bool ipSingleSwitchStusExpectNormal = 11; // 期望道岔定位 - // bool ipSingleSwitchStusExpectReverse = 12; // 期望道岔反位 - // bool ipSingleSwitchStusExpectBlock = 13; // 期望道岔单锁 - // bool ipSingleSwitchStusExpectUnblock = 14; // 期望道岔解除单锁 - // bool ipSingleSwitchStusInRoute = 15; // 是否在进路中锁闭 - // bool ipSingleSwitchStusManualMode = 16; // 道岔为手动操作模式 + bool ipSingleSwitchStusExpectLock = 9; // 期望锁闭 + bool ipSingleSwitchStusExpectUnlock = 10; // 期望锁闭解除 + bool ipSingleSwitchStusExpectNormal = 11; // 期望道岔定位 + bool ipSingleSwitchStusExpectReverse = 12; // 期望道岔反位 + bool ipSingleSwitchStusExpectBlock = 13; // 期望道岔单锁 + bool ipSingleSwitchStusExpectUnblock = 14; // 期望道岔解除单锁 + bool ipSingleSwitchStusInRoute = 15; // 是否在进路中锁闭 + bool ipSingleSwitchStusManualMode = 16; // 道岔为手动操作模式 bool ipSingleSwitchStusCut = 17; // 道岔切除 bool ipSingleSwitchStusAtcInvalid = 18; // 道岔区段被ATC报告失效 bool ipSingleSwitchStusOverlap = 19; // OVERLAP diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 24f47f6..1958d92 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -105,6 +105,8 @@ message Platform { string code = 2; bool hasdoor = 3; // 是否有屏蔽门 string direction = 4; // 行驶方向--屏蔽门上下 + string upAndDown =5; //上下行--upLink表示上行,downLink表示下行 + string refStation=6; //关联的车站 } message Station { @@ -112,8 +114,9 @@ message Station { string code = 2; bool hasControl = 3; // 是否有控制 bool concentrationStations = 4; //是否集中站 - // string kilometerCode = 5; //公里标 + // string kilometerCode = 5; //公里标 KilometerSystem kilometerSystem = 6; //公里标 + string name = 7; } message StationLine { @@ -206,8 +209,8 @@ message Section { RelatedRef pbRef = 5; // 区段B端关联的物理区段或道岔(非岔区) SectionType sectionType = 6; // 区段类型 repeated string axleCountings = 7; // 关联的计轴(岔区&&非岔区) - repeated string children = 8; // 下属逻辑区段id(非岔区) - string destinationCode = 9; // 目的地码 + repeated string children = 8; // 下属逻辑区段id(非岔区)/下属道岔id(岔区) + string destinationCode = 9; // 目的地码 } /** 逻辑区段 */