From ce3e695b060d918ef25b305dfe3271dad699ea7c Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Fri, 16 Jun 2023 15:50:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=85=AC=E9=87=8C=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index b391ce4..b591c22 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -109,6 +109,7 @@ message Station { string code = 2; bool hasControl = 3; // 是否有控制 bool concentrationStations=4; //是否集中站 + string kilometerCode=5; //公里标 } message StationLine { From 524a7e4f0afe5ca16b1b634ebedd1676176faa68 Mon Sep 17 00:00:00 2001 From: weizhihong Date: Fri, 16 Jun 2023 16:34:00 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=90=E5=88=97=E8=BD=A6=E7=8A=B6?= =?UTF-8?q?=E6=80=81=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; } // 线网信息 From 2697dec89345cec7bdfdb7f63b0b4872db30cbd3 Mon Sep 17 00:00:00 2001 From: weizhihong Date: Fri, 16 Jun 2023 19:39:20 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90websocket=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/ws_message.proto | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/protos/ws_message.proto b/protos/ws_message.proto index ad723cc..57c6663 100644 --- a/protos/ws_message.proto +++ b/protos/ws_message.proto @@ -44,14 +44,3 @@ message WsLineNetMessage { repeated diagram.LineNetTrainOffsetDiagram diagram = 1; } - -// 最后发送的消息信息 -message WsMessage { - oneof message_oneOf { - // 线路信息 - WsLineMessage lineMessage = 1; - - // 线网信息 - WsLineNetMessage lineNetMessage = 2; - } -} From 28c7e36dd7eb5872b6c968c9f47511391caa8a2a Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Mon, 19 Jun 2023 14:19:40 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=BD=A6=E6=AC=A1=E7=AA=97=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=8C=BA=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index b591c22..1c92212 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -121,6 +121,7 @@ message StationLine { message TrainWindow { CommonInfo common = 1; string code = 2; + string sectionId = 3; } message Train { From fbdae10583bfa40d64589cc9197d881b51cc551e Mon Sep 17 00:00:00 2001 From: weizhihong Date: Mon, 19 Jun 2023 16:34:17 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E7=BA=BF?= =?UTF-8?q?=E7=BD=91websocket=E7=BB=93=E6=9E=84=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/ws_message.proto | 2 ++ 1 file changed, 2 insertions(+) diff --git a/protos/ws_message.proto b/protos/ws_message.proto index 57c6663..ea234d8 100644 --- a/protos/ws_message.proto +++ b/protos/ws_message.proto @@ -43,4 +43,6 @@ message WsLineNetMessage { //线网车辆位置 repeated diagram.LineNetTrainOffsetDiagram diagram = 1; + //列车信息 + repeated state.Train train = 2; }