diff --git a/protos/device_info.proto b/protos/device_info.proto index cd0764c..fa502a8 100644 --- a/protos/device_info.proto +++ b/protos/device_info.proto @@ -15,14 +15,14 @@ message Section { // 区段类型 graphicData.Section.SectionType type = 3; - // 公里标 - repeated graphicData.KilometerSystem kilometerSystem = 4; - // 关联区段 - repeated Section children = 5; + repeated Section children = 4; + // 公里标 + repeated graphicData.KilometerSystem kilometerSystem = 5; + // 转换后的公里标数字 - repeated int64 convertKilometer = 6; + repeated int64 convertKilometer = 7; } // 道岔 @@ -32,14 +32,10 @@ message Switch { string code = 2; - graphicData.KilometerSystem switchKilometerSystem = 3; - - int64 switchConvertKilometer = 4; - // 关联道岔的公里标 - repeated graphicData.KilometerSystem kilometerSystem = 5; + repeated graphicData.KilometerSystem kilometerSystem = 3; // 转换后的公里标数字 - repeated int64 convertKilometer = 6; + repeated int64 convertKilometer = 4; } diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 7c728db..2cd760e 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -153,13 +153,14 @@ message IscsFan { message Turnout { CommonInfo common = 1; string code = 2; - repeated Point pointA = 6; // A端坐标列表 - repeated Point pointB = 7; // B端坐标列表 - repeated Point pointC = 8; // C端坐标列表 - RelatedRef paRef = 9; // 道岔A端关联的设备 - RelatedRef pbRef = 10; // 道岔B端关联的设备 - RelatedRef pcRef = 11; // 道岔C端关联的设备 - KilometerSystem kilometerSystem = 12; // 道岔公里标 + repeated Point pointA = 6; // A端坐标列表 + repeated Point pointB = 7; // B端坐标列表 + repeated Point pointC = 8; // C端坐标列表 + RelatedRef paRef = 9; // 道岔A端关联的设备 + RelatedRef pbRef = 10; // 道岔B端关联的设备 + RelatedRef pcRef = 11; // 道岔C端关联的设备 + // KilometerSystem kilometerSystem = 12; // 道岔公里标 + repeated KilometerSystem kilometerSystem = 13; // 道岔公里标 } message KilometerSystem { diff --git a/protos/train.proto b/protos/train.proto index 187f070..202e2a9 100644 --- a/protos/train.proto +++ b/protos/train.proto @@ -35,9 +35,9 @@ message TrainInfo { // 列车状态 // int32 mode = 14; state.TrainMode mode = 14; - // 到点 + // 到点 时间戳 精确到秒 10位长度 int64 arriveTime = 15; - // 发点 + // 发点 时间戳 精确到秒 10位长度 int64 departTime = 16; // 速度 float speed = 17; @@ -145,7 +145,7 @@ message TrainRecord{ * true-到达,false-出发 */ bool recordType = 12; - /** 到发时间(7) */ + /** 到发时间(7) 时间戳 精确到秒 10位长度 */ int64 recordTime = 13; } diff --git a/protos/ws_message.proto b/protos/ws_message.proto index 4926055..fb4921e 100644 --- a/protos/ws_message.proto +++ b/protos/ws_message.proto @@ -61,16 +61,13 @@ message WsLineNetTrainOffsetMessage { // 车组号 string groupId = 3; - // 目的地ID - int32 destinationId = 4; - //是否显示 - bool show = 5; + bool show = 4; // 列车公里标 - int64 kilometerCode = 6; + int64 kilometerCode = 5; // 运行方向 - int32 dir = 7; + int32 dir = 6; }