diff --git a/protos/alertConst.proto b/protos/alertConst.proto index 213040c..e8d95df 100644 --- a/protos/alertConst.proto +++ b/protos/alertConst.proto @@ -44,4 +44,14 @@ enum AlertType { SWITCH_DW_LOST = 9; //道岔反位失表 SWITCH_FW_LOST = 10; + //计轴 + AXLE_LED = 11; + //计轴红光带 + AXLE_LED_RED = 12; + //计轴大面积红光带 + AXLE_LED_RED_MOST = 13; + //计轴橙光带 + AXLE_LED_ORANGE = 14; + //计轴大面积橙光带 + AXLE_LED_ORANGE_MOST = 15; } diff --git a/protos/device_status.proto b/protos/device_status.proto index 11abfac..0cffa9c 100644 --- a/protos/device_status.proto +++ b/protos/device_status.proto @@ -31,6 +31,7 @@ message Rtu { int32 rtuId = 6; //消息时间戳 int64 timestamp = 7; + int32 lineId = 8; } message Station { @@ -64,6 +65,7 @@ message Station { int32 rtuId = 26; //消息时间戳 int64 timestamp = 27; + int32 lineId = 28; } message Signal { @@ -96,6 +98,7 @@ message Signal { int32 rtuId = 25; //消息时间戳 int64 timestamp = 26; + int32 lineId = 27; } message Entry { @@ -108,6 +111,7 @@ message Entry { int32 rtuId = 5; //消息时间戳 int64 timestamp = 6; + int32 lineId = 7; } message Switch { @@ -146,6 +150,7 @@ message Switch { int32 rtuId = 30; //消息时间戳 int64 timestamp = 31; + int32 lineId = 32; } message Track { @@ -170,6 +175,7 @@ message Track { int32 rtuId = 15; //消息时间戳 int64 timestamp = 16; + int32 lineId = 17; // track限速类型 enum LimitType { Unknown = 0; @@ -208,6 +214,7 @@ message Platform { int32 rtuId = 18; //消息时间戳 int64 timestamp = 19; + int32 lineId = 20; } message Scada { @@ -220,6 +227,7 @@ message Scada { int32 rtuId = 5; //消息时间戳 int64 timestamp = 6; + int32 lineId = 7; } message WaterProofDoor { @@ -234,6 +242,7 @@ message WaterProofDoor { int32 rtuId = 7; //消息时间戳 int64 timestamp = 8; + int32 lineId = 9; } message WorkArea { @@ -244,6 +253,7 @@ message WorkArea { int32 rtuId = 3; //消息时间戳 int64 timestamp = 4; + int32 lineId = 5; } message Gama { @@ -254,6 +264,7 @@ message Gama { int32 rtuId = 3; //消息时间戳 int64 timestamp = 4; + int32 lineId = 5; } message TrainMode { @@ -305,4 +316,5 @@ message OccNccFepNetwork { // true 代表与当前线路号的信息源(server)连接正常 // false 代表断开 bool active = 2; + int32 lineId = 3; } diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 32d6bb7..2b63d7d 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -212,7 +212,7 @@ message Section { repeated string axleCountings = 7; // 关联的计轴(岔区&&非岔区) repeated string children = 8; // 下属逻辑区段id(非岔区)/下属道岔id(岔区) string destinationCode = 9; // 目的地码 - bool turning = 10; //是否转辙轨 + bool turning = 10; //是否转换轨 } /** 逻辑区段 */ @@ -257,7 +257,7 @@ message RelatedRef { DevicePort devicePort = 3; //关联的设备端口 } -message Separator { // 分隔符 +message Separator {// 分隔符 CommonInfo common = 1; string code = 2; string separatorType = 3;