From 524a7e4f0afe5ca16b1b634ebedd1676176faa68 Mon Sep 17 00:00:00 2001
From: weizhihong <weizhihong@joylink.club>
Date: Fri, 16 Jun 2023 16:34:00 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=88=97=E8=BD=A6=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protos/device_status.proto | 72 ++++++++++++++++++++++++++++++++++++++
 protos/ws_message.proto    |  6 ++--
 2 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/protos/device_status.proto b/protos/device_status.proto
index 07aaabf..f3b0bd0 100644
--- a/protos/device_status.proto
+++ b/protos/device_status.proto
@@ -248,3 +248,75 @@ message OccNccFepNetwork{
   bool  active = 2;
 }
 
+// 2.7.8 列车状态信息
+message Train {
+  // 基础信息
+  // 列车表号
+  string trainId = 1;
+
+  // 列车车次号
+  string globalId = 2;
+
+  // 列车车组号
+  string groupId = 3;
+
+  // 局部序列号
+  int32 localSubId = 4;
+
+  // 列车类型
+  int32 trainType = 5;
+
+  // 速度
+  float speed = 6;
+
+  // 信息消息
+  // 运行方向
+  int32 direction = 7;
+
+  // 目的地ID
+  int32 destinationId = 8;
+
+  // 行驶站号
+  int32 stationId = 9;
+
+  // 站台号
+  int32 sideId = 10;
+
+  // 轨道名称
+  string trackName = 11;
+
+  // 到发点类型
+  bool recordType = 12;
+
+  // 到发时间
+  int64 recordTime = 13;
+
+  // 司机号
+  string driverId = 14;
+
+  // 运行路径号
+  int32 routeId = 15;
+
+  // 列车状态
+  TrainMode mode = 16;
+
+  // 车次窗编号
+  int32 nccWindow = 17;
+
+  // 车次窗位置
+  int32 nccWindowOffset = 18;
+
+  // 满载率
+  int32 rate = 19;
+
+  // 所在设备类型
+  int32 devType = 20;
+
+  // 所在设备名称
+  string devName = 21;
+
+  // 阻塞标记
+  int32 blockFlag = 22;
+}
+
+
diff --git a/protos/ws_message.proto b/protos/ws_message.proto
index d1ecf55..ad723cc 100644
--- a/protos/ws_message.proto
+++ b/protos/ws_message.proto
@@ -29,10 +29,12 @@ message WsLineMessage {
   repeated state.WorkArea workArea = 10;
   //区域自动驾驶
   repeated state.Gama gama = 11;
-  // 列车模式
+  //列车模式
   repeated state.TrainMode trainMode = 12;
-  // 信息源网络状态消息
+  //信息源网络状态消息
   repeated state.OccNccFepNetwork netWork = 13;
+  //列车信息
+  repeated state.Train train = 14;
 }
 
 // 线网信息