diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto
index 206395c..b391ce4 100644
--- a/protos/stationLayoutGraphics.proto
+++ b/protos/stationLayoutGraphics.proto
@@ -20,6 +20,7 @@ message RtssGraphicStorage {
   repeated TrainLine trainLines = 13;
   repeated PathLine pathLines = 14;
   repeated Polygon polygons = 15;
+  repeated TrainWindow trainWindows = 16;
 }
 
 message Canvas {
@@ -107,6 +108,7 @@ message Station {
   CommonInfo common = 1;
   string code = 2;
   bool hasControl = 3; // 是否有控制
+  bool concentrationStations=4;  //是否集中站
 }
 
 message StationLine {
@@ -115,6 +117,11 @@ message StationLine {
   bool hasTransfer = 3; // 是否有换乘图标
 }
 
+message TrainWindow {
+  CommonInfo common = 1;
+  string code = 2;
+}
+
 message Train {
   CommonInfo common = 1;
   string code = 2;
diff --git a/protos/ws_message.proto b/protos/ws_message.proto
index 078a2e5..d1ecf55 100644
--- a/protos/ws_message.proto
+++ b/protos/ws_message.proto
@@ -2,40 +2,54 @@ 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 {
+  oneof message_oneOf {
+    // 线路信息
+    WsLineMessage lineMessage = 1;
+
+    // 线网信息
+    WsLineNetMessage lineNetMessage = 2;
+  }
 }