diff --git a/protos/Device.proto b/protos/Device.proto
deleted file mode 100644
index a19e590..0000000
--- a/protos/Device.proto
+++ /dev/null
@@ -1,41 +0,0 @@
-syntax = "proto3";
-
-option java_package = "club.joylink.xiannccda.dto.protos";
-option java_outer_classname = "DeviceProto";
-message Device{
-  int32 lineId = 1;
-  int32 reportId = 2;
-
-}
-
-message DeviceDetail{
-  string deviceType = 1;
-  string deviceName = 2;
-  //  int32 status = 3;
-
-}
-message Track{
-  Device device = 1;
-  DeviceDetail detail = 2;
-  //限速
-  float speedLimit = 3;
-  //限速类型
-  //  为1时，CBTC限速；
-  //    为2时，联锁限速；
-  //    为4时，同时限速。
-  int32 limitType = 4;
-}
-
-message Platform{
-  Device device = 1;
-  DeviceDetail detail = 2;
-  //停站时间
-  int32 stopTime = 3;
-}
-
-message Switch{
-  Device device = 1;
-  DeviceDetail detail = 2;
-  //限速
-  float speedLimit = 3;
-}
\ No newline at end of file
diff --git a/protos/LineNetTrainOffset.proto b/protos/LineNetTrainOffset.proto
index 6166709..9320b64 100644
--- a/protos/LineNetTrainOffset.proto
+++ b/protos/LineNetTrainOffset.proto
@@ -7,20 +7,18 @@ message LineNetTrainOffset{
   //线路id
   int32 lineId = 1;
   //车组号
-  string Group_id = 2;
+  string groupId = 2;
   //方向
   int32 dir = 3;
-  //  true-到达，false-出发
-  bool initType = 4;
-  //位置
-  int32 offset = 5;
-  //目的地id
-  int32 destinationId = 6;
-  //后方车站
-  int32 backId = 7;
-  //是否删除
-  bool show = 8;
-  //完成率
-  float  rate = 9;
+  //是否显示
+  bool show = 4;
+  //车次窗编号
+  int32 windowNo = 5;
+  //车次窗位置
+  int32 windowOffset = 6;
+  //目的地
+  string destinationId = 7;
+  //后部车站
+  string backId = 8;
 }
 
diff --git a/protos/device_status.proto b/protos/device_status.proto
index 14cc6f5..07aaabf 100644
--- a/protos/device_status.proto
+++ b/protos/device_status.proto
@@ -5,210 +5,246 @@ option java_package = "club.joylink.xiannccda.dto.protos";
 option java_outer_classname = "DeviceStatusProto";
 
 message Rtu{
-   bool ipRtuStusDown = 1;
-   bool ipRtuStusInLocalCtrl = 2;
-   bool ipRtuStusInCentralCtrl = 3;
-   bool ipRtuStusInEmergencyCtrl = 4;
-   //设备唯一识别码，一般为设备名称
-   string id = 5;
+  bool ipRtuStusDown = 1;
+  bool ipRtuStusInLocalCtrl = 2;
+  bool ipRtuStusInCentralCtrl = 3;
+  bool ipRtuStusInEmergencyCtrl = 4;
+  //设备唯一识别码，一般为设备名称
+  string id = 5;
 }
 
 message Station{
-   bool ipStaStusTermMode1 = 1;
-   bool ipStaStusTermMode2 = 2;
-   bool ipStaStusTermMode3 = 3;
-   bool ipStaStusTermMode4 = 4;
-   bool ipStaStusTermMode5 = 5;
-   bool ipStaStusTermMode6 = 6;
-   bool ipStaStusExpectTermMode1 = 7;
-   bool ipStaStusExpectTermMode2 = 8;
-   bool ipStaStusExpectTermMode3 = 9;
-   bool ipStaStusExpectTermMode4 = 10;
-   bool ipStaStusExpectTermMode5 = 11;
-   bool ipStaStusExpectTermMode6 = 12;
-   bool ipStaStusInCycle1 = 13;
-   bool ipStaStusInCycle2 = 14;
-   bool ipStaStusInCycle3 = 15;
-   bool ipStaStusInCycle4 = 16;
-   bool ipStaStusInCycle5 = 17;
-   bool ipStaStusInCycle6 = 18;
-   bool ipStaStusExpectCycle1 = 19;
-   bool ipStaStusExpectCycle2 = 20;
-   bool ipStaStusExpectCycle3 = 21;
-   bool ipStaStusExpectCycle4 = 22;
-   bool ipStaStusExpectCycle5 = 23;
-   bool ipStaStusExpectCycle6 = 24;
-   //设备唯一识别码，一般为设备名称
-   string id = 25;
+  bool ipStaStusTermMode1 = 1;
+  bool ipStaStusTermMode2 = 2;
+  bool ipStaStusTermMode3 = 3;
+  bool ipStaStusTermMode4 = 4;
+  bool ipStaStusTermMode5 = 5;
+  bool ipStaStusTermMode6 = 6;
+  bool ipStaStusExpectTermMode1 = 7;
+  bool ipStaStusExpectTermMode2 = 8;
+  bool ipStaStusExpectTermMode3 = 9;
+  bool ipStaStusExpectTermMode4 = 10;
+  bool ipStaStusExpectTermMode5 = 11;
+  bool ipStaStusExpectTermMode6 = 12;
+  bool ipStaStusInCycle1 = 13;
+  bool ipStaStusInCycle2 = 14;
+  bool ipStaStusInCycle3 = 15;
+  bool ipStaStusInCycle4 = 16;
+  bool ipStaStusInCycle5 = 17;
+  bool ipStaStusInCycle6 = 18;
+  bool ipStaStusExpectCycle1 = 19;
+  bool ipStaStusExpectCycle2 = 20;
+  bool ipStaStusExpectCycle3 = 21;
+  bool ipStaStusExpectCycle4 = 22;
+  bool ipStaStusExpectCycle5 = 23;
+  bool ipStaStusExpectCycle6 = 24;
+  //设备唯一识别码，一般为设备名称
+  string id = 25;
 }
 
 message Signal{
-   bool redOpen = 1;
-   bool redFlash = 2;
-   bool greenOpen = 3;
-   bool greenFlash = 4;
-   bool yellowOpen = 5;
-   bool yellowFlash = 6;
-   bool whiteOpen = 7;
-   bool whiteFlash = 8;
-   bool blueOpen = 9;
-   bool blueFlash = 10;
-   bool fleetMode = 11;
-   bool ctrlFleetMode = 12;
-   bool autoMode = 13;
-   bool ctrlAutoMode = 14;
-   bool extinguish = 15;
-   bool approachLock = 16;
-   bool protectRoute = 17;
-   bool autoRouteDisable = 18;
-   bool callon = 19;
-   bool yellowYellow = 20;
-   bool yellowGreen = 21;
-   bool blocked = 22;
-   bool lampFailure = 23;
-   //设备唯一识别码，一般为设备名称
-   string id = 24;
+  bool redOpen = 1;
+  bool redFlash = 2;
+  bool greenOpen = 3;
+  bool greenFlash = 4;
+  bool yellowOpen = 5;
+  bool yellowFlash = 6;
+  bool whiteOpen = 7;
+  bool whiteFlash = 8;
+  bool blueOpen = 9;
+  bool blueFlash = 10;
+  bool fleetMode = 11;
+  bool ctrlFleetMode = 12;
+  bool autoMode = 13;
+  bool ctrlAutoMode = 14;
+  bool extinguish = 15;
+  bool approachLock = 16;
+  bool protectRoute = 17;
+  bool autoRouteDisable = 18;
+  bool callon = 19;
+  bool yellowYellow = 20;
+  bool yellowGreen = 21;
+  bool blocked = 22;
+  bool lampFailure = 23;
+  //设备唯一识别码，一般为设备名称
+  string id = 24;
 }
 
 message Entry{
-   bool dirLeft = 1;
-   bool dirRight = 2;
-   bool dirLocked = 3;
-   //设备唯一识别码，一般为设备名称
-   string id = 4;
+  bool dirLeft = 1;
+  bool dirRight = 2;
+  bool dirLocked = 3;
+  //设备唯一识别码，一般为设备名称
+  string id = 4;
 }
 
 message Switch{
-   bool ipSingleSwitchStusCiOccupied = 1;
-   bool ipSingleSwitchStusCbtcOccupied = 2;
-   bool ipSingleSwitchStusLocked = 3;
-   bool ipSingleSwitchStusFailLocked = 4;
-   bool ipSingleSwitchStusNormal = 5;
-   bool ipSingleSwitchStusReverse = 6;
-   bool ipSingleSwitchStusBlocked1 = 7;
-   bool ipSingleSwitchStusJammed = 8;
-   bool ipSingleSwitchStusExpectLock = 9;
-   bool ipSingleSwitchStusExpectUnlock = 10;
-   bool ipSingleSwitchStusExpectNormal = 11;
-   bool ipSingleSwitchStusExpectReverse = 12;
-   bool ipSingleSwitchStusExpectBlock = 13;
-   bool ipSingleSwitchStusExpectUnblock = 14;
-   bool ipSingleSwitchStusInRoute = 15;
-   bool ipSingleSwitchStusManualMode = 16;
-   bool ipSingleSwitchStusCut = 17;
-   bool ipSingleSwitchStusAtcInvalid = 18;
-   bool ipSingleSwitchStusOverlap = 19;
-   bool ipSingleSwitchStusTsrCbtcMain = 20;
-   bool ipSingleSwitchStusTsrCbtcNormal = 21;
-   bool ipSingleSwitchStusTsrCbtcReverse = 22;
-   bool ipSingleSwitchStusTsrBmMain = 23;
-   bool ipSingleSwitchStusTsrBmNormal = 24;
-   bool ipSingleSwitchStusTsrBmReverse = 25;
-   bool ipSingleSwitchStusBlocked2 = 26;
-   bool ipSingleSwitchStusLostIndication = 27;
-   //设备唯一识别码，一般为设备名称
-   string id = 28;
+  bool ipSingleSwitchStusCiOccupied = 1;
+  bool ipSingleSwitchStusCbtcOccupied = 2;
+  bool ipSingleSwitchStusLocked = 3;
+  bool ipSingleSwitchStusFailLocked = 4;
+  bool ipSingleSwitchStusNormal = 5;
+  bool ipSingleSwitchStusReverse = 6;
+  bool ipSingleSwitchStusBlocked1 = 7;
+  bool ipSingleSwitchStusJammed = 8;
+  bool ipSingleSwitchStusExpectLock = 9;
+  bool ipSingleSwitchStusExpectUnlock = 10;
+  bool ipSingleSwitchStusExpectNormal = 11;
+  bool ipSingleSwitchStusExpectReverse = 12;
+  bool ipSingleSwitchStusExpectBlock = 13;
+  bool ipSingleSwitchStusExpectUnblock = 14;
+  bool ipSingleSwitchStusInRoute = 15;
+  bool ipSingleSwitchStusManualMode = 16;
+  bool ipSingleSwitchStusCut = 17;
+  bool ipSingleSwitchStusAtcInvalid = 18;
+  bool ipSingleSwitchStusOverlap = 19;
+  bool ipSingleSwitchStusTsrCbtcMain = 20;
+  bool ipSingleSwitchStusTsrCbtcNormal = 21;
+  bool ipSingleSwitchStusTsrCbtcReverse = 22;
+  bool ipSingleSwitchStusTsrBmMain = 23;
+  bool ipSingleSwitchStusTsrBmNormal = 24;
+  bool ipSingleSwitchStusTsrBmReverse = 25;
+  bool ipSingleSwitchStusBlocked2 = 26;
+  bool ipSingleSwitchStusLostIndication = 27;
+  //设备唯一识别码，一般为设备名称
+  string id = 28;
+  //限速值KM/H
+  int32 speedLimit = 29;
 }
 
 message Track{
-   bool ciOccupied = 1;
-   bool cbtcOccupied = 2;
-   bool locked = 3;
-   bool failLocked = 4;
-   bool expectLock = 5;
-   bool expectUnlock = 6;
-   bool inRoute = 7;
-   bool cut = 8;
-   bool atcInvalid = 9;
-   bool overlap = 10;
-   bool blocked = 11;
-   //设备唯一识别码，一般为设备名称
-   string id = 12;
+  bool ciOccupied = 1;
+  bool cbtcOccupied = 2;
+  bool locked = 3;
+  bool failLocked = 4;
+  bool expectLock = 5;
+  bool expectUnlock = 6;
+  bool inRoute = 7;
+  bool cut = 8;
+  bool atcInvalid = 9;
+  bool overlap = 10;
+  bool blocked = 11;
+  //设备唯一识别码，一般为设备名称
+  string id = 12;
+  //限速
+  int32 speedLimit = 13;
+  //限速类型
+  LimitType limitType = 14;
+
+  //track限速类型
+  enum LimitType{
+    Unknown = 0;
+    //为1时，CBTC限速
+    Cbtc = 1;
+    //为2时，联锁限速；
+    Interlock = 2;
+    //为4时，同时限速。
+    CbtcInterlock = 4;
+  }
 }
 
 message Platform{
-   bool emergstop = 1;
-   bool trainberth = 2;
-   bool close = 3;
-   bool upHold = 4;
-   bool downHold = 5;
-   bool upOccHold = 6;
-   bool downOccHold = 7;
-   bool psdOpen = 8;
-   bool psdCut = 9;
-   bool upSkipstop = 10;
-   bool downSkipstop = 11;
-   bool upTrainSkipstop = 12;
-   bool downTrainSkipstop = 13;
-   //设备唯一识别码，一般为设备名称
-   string id = 14;
+  bool emergstop = 1;
+  bool trainberth = 2;
+  bool close = 3;
+  bool upHold = 4;
+  bool downHold = 5;
+  bool upOccHold = 6;
+  bool downOccHold = 7;
+  bool psdOpen = 8;
+  bool psdCut = 9;
+  bool upSkipstop = 10;
+  bool downSkipstop = 11;
+  bool upTrainSkipstop = 12;
+  bool downTrainSkipstop = 13;
+  //设备唯一识别码，一般为设备名称
+  string id = 14;
+  //下一区间运行时间
+  int32 nextSectionRunTime = 15;
+  //下一区间运行等级
+  int32 nextSectionRunLevel = 16;
+  //停站时间
+  int32 stopTime = 17;
 }
 
 message Scada{
-   bool scadaOn = 1;
-   bool scadaSinglePower = 2;
-   bool scadaUnkown = 3;
-   //设备唯一识别码，一般为设备名称
-   string id = 4;
+  bool scadaOn = 1;
+  bool scadaSinglePower = 2;
+  bool scadaUnkown = 3;
+  //设备唯一识别码，一般为设备名称
+  string id = 4;
 }
 
 message WaterProofDoor{
-   bool doorClosed = 1;
-   bool doorExpectClose = 2;
-   bool doorAgreeClosed = 3;
-   bool doorClosing = 4;
-   bool doorOpenLock = 5;
-   //设备唯一识别码，一般为设备名称
-   string id = 6;
+  bool doorClosed = 1;
+  bool doorExpectClose = 2;
+  bool doorAgreeClosed = 3;
+  bool doorClosing = 4;
+  bool doorOpenLock = 5;
+  //设备唯一识别码，一般为设备名称
+  string id = 6;
 }
 
 message WorkArea{
-   bool ipStusWorkAreaEnable = 1;
-   //设备唯一识别码，一般为设备名称
-   string id = 2;
+  bool ipStusWorkAreaEnable = 1;
+  //设备唯一识别码，一般为设备名称
+  string id = 2;
 }
 
 message Gama{
-   bool ipStusGamaDisable = 1;
-   //设备唯一识别码，一般为设备名称
-   string id = 2;
+  bool ipStusGamaDisable = 1;
+  //设备唯一识别码，一般为设备名称
+  string id = 2;
 }
 
 message TrainMode{
-   bool ipModeTrainTypeManual = 1;
-   bool ipModeTrainTypeHead = 2;
-   bool ipModeTrainTypeSpecial = 3;
-   bool ipModeTrainTypeSchedule = 4;
-   bool ipModeTrainTypeRoute = 5;
-   bool ipModeTrainTypeShuttle = 6;
-   bool ipModeTrainTypeLineup = 7;
-   bool ipModeTrainSchdEarly = 8;
-   bool ipModeTrainSchdLate = 9;
-   bool ipModeTrainSkipstop = 10;
-   bool ipModeTrainCbtcMode = 11;
-   bool ipModeTrainAtpCut = 12;
-   bool ipModeTrainBerthed = 13;
-   bool ipModeTrainStoped = 14;
-   bool ipModeTrainHolded = 15;
-   bool ipModeTrainItama = 16;
-   bool ipModeTrainDirUp = 17;
-   bool ipModeTrainDirDown = 18;
-   bool ipModeTrainDirHeadUp = 19;
-   bool ipModeTrainDirHeadDown = 20;
-   bool ipModeTrainDoorOpen = 21;
-   bool ipModeTrainRsAlarm = 22;
-   bool ipModeTrainDoorAlarm = 23;
-   bool ipModeTrainEbAlarm = 24;
-   bool ipModeTrainIntegrityAlarm = 25;
-   bool ipModeTrainDriveModeAm = 26;
-   bool ipModeTrainDriveModeCm = 27;
-   bool ipModeTrainDriveModeRmf = 28;
-   bool ipModeTrainDriveModeDto = 29;
-   bool ipModeTrainDriveModeAtb = 30;
-   bool ipModeTrainDriveBlockAm = 31;
-   bool ipModeTrainDriveBlockCm = 32;
-   bool ipModeTrainDriveModeRmr = 33;
-   bool ipModeTrainDriveModeWash = 34;
-   //设备唯一识别码，一般为设备名称
-   string id = 35;
+  bool ipModeTrainTypeManual = 1;
+  bool ipModeTrainTypeHead = 2;
+  bool ipModeTrainTypeSpecial = 3;
+  bool ipModeTrainTypeSchedule = 4;
+  bool ipModeTrainTypeRoute = 5;
+  bool ipModeTrainTypeShuttle = 6;
+  bool ipModeTrainTypeLineup = 7;
+  bool ipModeTrainSchdEarly = 8;
+  bool ipModeTrainSchdLate = 9;
+  bool ipModeTrainSkipstop = 10;
+  bool ipModeTrainCbtcMode = 11;
+  bool ipModeTrainAtpCut = 12;
+  bool ipModeTrainBerthed = 13;
+  bool ipModeTrainStoped = 14;
+  bool ipModeTrainHolded = 15;
+  bool ipModeTrainItama = 16;
+  bool ipModeTrainDirUp = 17;
+  bool ipModeTrainDirDown = 18;
+  bool ipModeTrainDirHeadUp = 19;
+  bool ipModeTrainDirHeadDown = 20;
+  bool ipModeTrainDoorOpen = 21;
+  bool ipModeTrainRsAlarm = 22;
+  bool ipModeTrainDoorAlarm = 23;
+  bool ipModeTrainEbAlarm = 24;
+  bool ipModeTrainIntegrityAlarm = 25;
+  bool ipModeTrainDriveModeAm = 26;
+  bool ipModeTrainDriveModeCm = 27;
+  bool ipModeTrainDriveModeRmf = 28;
+  bool ipModeTrainDriveModeDto = 29;
+  bool ipModeTrainDriveModeAtb = 30;
+  bool ipModeTrainDriveBlockAm = 31;
+  bool ipModeTrainDriveBlockCm = 32;
+  bool ipModeTrainDriveModeRmr = 33;
+  bool ipModeTrainDriveModeWash = 34;
+  //设备唯一识别码，一般为设备名称
+  string id = 35;
 }
+
+//////////////////////////////////////////////////////////////////////
+
+//2.7.2	信息源网络状态消息
+//NCC FEP与OCC FEP 间的网络连接状态
+message OccNccFepNetwork{
+  //当前线路号
+  string id = 1;
+  //true 代表与当前线路号的信息源(server)连接正常
+  //false 代表断开
+  bool  active = 2;
+}
+
diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto
index d66413d..e88d0d7 100644
--- a/protos/stationLayoutGraphics.proto
+++ b/protos/stationLayoutGraphics.proto
@@ -10,11 +10,14 @@ message RtssGraphicStorage {
   repeated IscsFan iscsFans = 3;
   repeated Platform Platforms = 4;
   repeated Station stations = 5;
-  repeated Rect Rects = 6;
+  repeated Rect rects = 6;
   repeated Train train = 7;
   repeated Signal signals = 8;
   repeated Turnout turnouts = 9;
-  repeated RunLine runLines = 10;
+  repeated Section section = 10;
+  repeated StationLine stationLines = 11;
+  repeated RunLine runLines = 12;
+
 }
 
 message Canvas {
@@ -77,17 +80,17 @@ message Rect {
   string code = 2;
   int32 lineWidth = 3;       // 线宽
   string lineColor = 4;      // 线色
-  Point point = 5;           // 位置坐标
-  float width = 6;           //宽度
-  float height = 7;          //高度
-  repeated Point points = 8; // 点坐标列表
+  float width = 5;           //宽度
+  float height = 6;          //高度
+  int32 radius = 7;          //圆角半径
+  Point point = 8;          // 画第一个点的坐标
 }
 
 message Platform {
   CommonInfo common = 1;
   string code = 2;
-  bool hasdoor = 3;               // 是否有屏蔽门
-  string direction = 4;      // 行驶方向--屏蔽门上下
+  bool hasdoor = 3;     // 是否有屏蔽门
+  string direction = 4; // 行驶方向--屏蔽门上下
 }
 
 message Station {
@@ -95,6 +98,12 @@ message Station {
   string code = 2;
 }
 
+message StationLine {
+  CommonInfo common = 1;
+  string code = 2;
+  bool hasTransfer = 3;   // 是否有换乘图标
+}
+
 message Train {
   CommonInfo common = 1;
   string code = 2;
@@ -126,5 +135,10 @@ message RunLine {
   string code = 2;
   repeated Point points = 3;
   string nameColor = 4;
-  string nameBgColor = 5;
+  string nameBgColor = 5;}
+
+message Section {
+  CommonInfo common = 1;
+  string code = 2;
+  repeated Point points = 3;
 }
diff --git a/protos/trans.proto b/protos/trans.proto
new file mode 100644
index 0000000..7ef69d3
--- /dev/null
+++ b/protos/trans.proto
@@ -0,0 +1,50 @@
+syntax = "proto3";
+
+//向前端推送的数据定义
+
+package trans;
+import "device_status.proto";
+option java_package = "club.joylink.xiannccda.dto.protos";
+option java_outer_classname = "TransProto";
+
+//线路集中站设备状态数据
+message RtuDevicesStorage{
+  //线路号
+  int32  lineId = 1;
+  //集中站号
+  int32  rtuId  = 2;
+  //true-集中站所有设备的状态;false-增量状态
+  bool   all = 3;
+  //信号机
+  repeated state.Signal signal = 4;
+  //道岔
+  repeated state.Switch switch = 5;
+  //站台
+  repeated state.Platform platform = 6;
+  //轨道
+  repeated state.Track track =7;
+  //设备集中站
+  repeated state.Rtu rtu = 8;
+  //车站
+  repeated state.Station station = 9;
+  //方向设备
+  repeated state.Entry entry = 10;
+  //供电区段
+  repeated state.Scada scada = 11;
+  //防淹门
+  repeated state.WaterProofDoor waterProofDoor = 12;
+  //工作区
+  repeated state.WorkArea workArea = 13;
+  //区域自动驾驶
+  repeated state.Gama gama = 14;
+}
+
+//线路所有集中站设备状态
+message LineDevicesStorage{
+  //线路号
+  int32  lineId = 1;
+  //true-线路所有设备的状态;false-增量状态
+  bool   all = 2;
+  //线路中集中站设备状态
+  repeated RtuDevicesStorage storage = 3;
+}