diff --git a/protos/train.proto b/protos/train.proto index 7e46d24..6d3d1ce 100644 --- a/protos/train.proto +++ b/protos/train.proto @@ -33,7 +33,8 @@ message TrainInfo { // 计划偏离时间 int32 otpTime = 13; // 列车状态 - int32 mode = 14; + // int32 mode = 14; + state.TrainMode mode = 14; // 到点 int64 arriveTime = 15; // 发点 @@ -70,7 +71,7 @@ message TrainRemove{ string devName = 5; // 列车标示号,全线唯一(若无法提供,缺省值为0) - int32 trainIndex = 6; + string trainIndex = 6; // 列车编组号 string groupId = 7; } diff --git a/protos/ws_message.proto b/protos/ws_message.proto index 1053786..91fac50 100644 --- a/protos/ws_message.proto +++ b/protos/ws_message.proto @@ -31,11 +31,11 @@ message WsLineMessage { //区域自动驾驶 repeated state.Gama gama = 11; //列车模式 - repeated state.TrainMode trainMode = 12; + // repeated state.TrainMode trainMode = 12; //信息源网络状态消息 - repeated state.OccNccFepNetwork netWork = 13; + repeated state.OccNccFepNetwork netWork = 12; //列车信息 - repeated train.TrainInfo train = 14; + repeated train.TrainInfo train = 13; } // 线网信息