diff --git a/protos/train.proto b/protos/train.proto index 6d3d1ce..187f070 100644 --- a/protos/train.proto +++ b/protos/train.proto @@ -41,14 +41,16 @@ message TrainInfo { int64 departTime = 16; // 速度 float speed = 17; - //是否显示 - bool show = 18; + //车次号变化状态 true=添加;false = 更新 - bool type = 19; + bool type = 18; //运行路径号(若无法提供,缺省值为0) - int32 routeId = 20; + int32 routeId = 19; //满载率 - int32 rate = 21; + int32 rate = 20; + TrainRemove remove = 21; + TrainBlock block = 22; + TrainRecord record = 23; } message NccWindow{ int32 nccWindow = 1; @@ -59,16 +61,13 @@ message TrainRemove{ // 线路号 int32 lineId = 1; // 集中站站号 - int32 rtuId = 2; // NCC车次窗编号 // 列车在车次窗中的位置 NccWindow window = 3; // 列车所在的设备的类型 - state.DeviceType deviceType = 4; // 列车所在的设备的名称 - string devName = 5; // 列车标示号,全线唯一(若无法提供,缺省值为0) string trainIndex = 6; @@ -90,24 +89,18 @@ message TrainBlock{ // 2:未知 int32 direction = 4; // 列车所在区间左边车站的站号 - int32 stationIDInUpSide = 5; // 列车所在区间右边车站的站号 - int32 stationIDInDownSide = 6; // 集中站站号 - int32 rtuId = 7; // 列车所在的设备的类型 - state.DeviceType deviceType = 8; // 列车所在的设备的名称 - string DevName = 9; // 列车阻塞标记 // 1:列车阻塞 // 0:列车没有阻塞 - int32 blockFlag = 10; } diff --git a/protos/ws_message.proto b/protos/ws_message.proto index 511d035..eadf886 100644 --- a/protos/ws_message.proto +++ b/protos/ws_message.proto @@ -40,10 +40,7 @@ message WsLineMessage { //线路列车信息 message WsLineTrainMessage{ - repeated train.TrainInfo train = 1; - repeated train.TrainBlock trainBlock = 2; - repeated train.TrainRecord trainRecord = 3; - repeated train.TrainRemove trainRemove = 4; + repeated train.TrainInfo trainInfo = 1; } // 线网信息