From d0ec8b263aeaab9c80b936c40aaa038682c1008a Mon Sep 17 00:00:00 2001
From: weizhihong <weizhihong@joylink.club>
Date: Fri, 16 Jun 2023 09:59:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9websocket=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protos/ws_message.proto | 46 ++++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/protos/ws_message.proto b/protos/ws_message.proto
index 078a2e5..217c968 100644
--- a/protos/ws_message.proto
+++ b/protos/ws_message.proto
@@ -2,40 +2,52 @@ syntax = "proto3";
 
 package state; //模型的可变的状态数据
 import "device_status.proto";
+import "LineNetTrainOffsetDiagram.proto";
 option java_package = "club.joylink.xiannccda.dto.protos";
 option java_outer_classname = "WsMessageProto";
 
 message WsLineMessage {
-  //线路号
-  int32 lineId = 1;
   // 设备集中站
-  repeated state.Rtu rtu = 2;
+  repeated state.Rtu rtu = 1;
   // 车站
-  repeated state.Station station = 3;
+  repeated state.Station station = 2;
   //信号机
-  repeated state.Signal signal = 4;
+  repeated state.Signal signal = 3;
   //方向设备
-  repeated state.Entry entry = 5;
+  repeated state.Entry entry = 4;
   //道岔
-  repeated state.Switch switch = 6;
+  repeated state.Switch switch = 5;
   //轨道
-  repeated state.Track track = 7;
+  repeated state.Track track = 6;
   //站台
-  repeated state.Platform platform = 8;
+  repeated state.Platform platform = 7;
   //供电区段
-  repeated state.Scada scada = 9;
+  repeated state.Scada scada = 8;
   //防淹门
-  repeated state.WaterProofDoor waterProofDoor = 10;
+  repeated state.WaterProofDoor waterProofDoor = 9;
   //工作区
-  repeated state.WorkArea workArea = 11;
+  repeated state.WorkArea workArea = 10;
   //区域自动驾驶
-  repeated state.Gama gama = 12;
+  repeated state.Gama gama = 11;
   // 列车模式
-  repeated state.TrainMode trainMode = 13;
+  repeated state.TrainMode trainMode = 12;
   // 信息源网络状态消息
-  repeated state.OccNccFepNetwork netWork = 14;
+  repeated state.OccNccFepNetwork netWork = 13;
 }
 
-message WsMessage {
-  repeated WsLineMessage message = 1;
+// 线网信息
+message WsLineNetMessage {
+
+  //线网车辆位置
+  repeated diagram.LineNetTrainOffsetDiagram diagram = 1;
+
+}
+
+// 最后发送的消息信息
+message WsMessage {
+  // 线路信息
+  repeated WsLineMessage lineMessage = 1;
+
+  // 线网信息
+  WsLineNetMessage lineNetMessage = 2;
 }