列车动力学添加车组，仿真内添加列车添加车组

[修改]12号线联锁通信服务如果启动失败，则启动参数无法更换bug

protos/common_data.proto

@@ -0,0 +1,76 @@
+syntax = "proto3";
+
+
+package common;
+
+//option java_package = "club.joylink.bjrtss.ats.verify.protos";
+//option java_outer_classname = "LayoutGraphicsProto";
+option go_package = "joylink.club/bj-rtsts-server/dto/common_proto";
+//动力学列车配置
+message TrainDynamicConfig{
+  //列车的质量（100=1ton）
+  //  int32 mass=1;
+  //基本阻力参数A
+  float davisParamA=1;
+  //  基本阻力参数B
+  float davisParamB=2;
+  //  基本阻力参数C
+  float davisParamC=3;
+  //曲线阻力参数R1
+  float curveResistanceParamR1=4;
+  //  曲线阻力参数R2
+  float curveResistanceParamR2=5;
+  //  曲线阻力参数R3
+  float curveResistanceParamR3=6;
+  //  曲线阻力参数R4
+  float curveResistanceParamR4=7;
+  //旋转质量参数
+  float revolvingMassParam=8;
+
+  //是否跳跃
+  bool jump=9;
+  //打滑加速度(m/s) 默认0
+  float slipA=10;
+//    打滑冲击率(m/s) 默认0
+  float slipR=11;
+  // 打滑持续时间ms 默认0
+  int32 slipD=12;
+
+  // 空转加速度（m/s2），默认值：0
+  float idlingA = 14;
+  // 空转冲击率（m/s3），默认值：0
+  float idlingR = 15;
+//    空转持续时间（ms），默认值：0
+  int32 idlingD = 16;
+  //过标/欠标（mm）（正数过标，负数欠标）
+  int32 stopSign=17;
+  //前溜/后溜（m/s）默认0
+  float slide = 18;
+}
+//列车一端的状态
+message TrainEndsState{
+  //速度传感器
+  bool speedSensorEnableA = 1;
+  bool speedSensorEnableB = 2;
+  //雷达是否有效
+  bool radarEnable = 3;
+  //雷达测速差值（千米/小时）
+  float radarCheckSpeedDiff = 4;
+  //雷达检测时间(秒)
+  int32 radarCheckTime = 5;
+  //加速度计是否有效
+  bool accEnable = 6;
+  //加速度测速差值（米/秒）
+  float accCheckSpeedDiff = 7;
+  //加速度持续时间
+  int32 accCheckTime = 8;
+  // 速传速度输出（千米/小时）
+  int32 accOutSpeed = 9;
+  // 雷达速度输出（千米/小时）
+  int32 radarOutSpeed = 10;
+
+  //记录雷达设置检测时间的时间点，用于计算周期内的数字
+  int64  radarCheckTimeOverAt = 11;
+  //记录加速度计设置检测时间的时间点，用于计算周期内的数字
+  int64 accCheckTimeOverAt = 12;
+}

protos/ibpGraphics.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 import "stationLayoutGraphics.proto";
 package ibpGraphicData;
-option go_package = "./ats/verify/protos/graphicData";
+option go_package = "joylink.club/bj-rtsts-server/dto/data_proto";
 
 message IBPGraphicStorage {
   graphicData.Canvas canvas = 1;
@@ -13,6 +13,7 @@ message IBPGraphicStorage {
   // UniqueIdType UniqueIdPrefix = 7;
   repeated IbpRelatedDevice ibpRelatedDevices = 8;
   repeated IbpLight ibpLights = 9;
+  repeated IbpStationText ibpStationTexts = 10;
 }
 
 message IBPButton {
@@ -73,3 +74,21 @@ message IbpRelatedDevice {
   repeated graphicData.DeviceCombinationtype combinationtypes = 2; //组合类型
   // graphicData.RelatedRef.DeviceType deviceType = 3; //设备类型
 }
+
+message IbpStationText {
+  enum IbpStationTextType {
+    CURRENT = 0;
+    UP = 1;
+    DOWN = 2;
+  }
+  enum IbpStationTextAlign {
+    LEFT = 0;
+    RIGHT = 1;
+    CENTER = 2;
+  }
+  graphicData.CommonInfo common = 1;
+  IbpStationTextType type = 2;
+  string color = 4;
+  int32 fontSize = 5;
+  IbpStationTextAlign align = 6;
+}

protos/picture.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-option go_package = "./ats/verify/protos/graphicData";
+option go_package = "joylink.club/bj-rtsts-server/dto/data_proto";
 
 enum PictureType {
   /** 平面布置图 */
@@ -11,4 +11,8 @@ enum PictureType {
   RelayCabinetLayout = 2;
   /** IBP盘 */
   IBP = 3;
+  /** 列车数据 */
+  TrainData = 4;
+  /** 列车驾驶台 */
+  TrainControlCab = 5;
 }

protos/pslGraphics.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 import "stationLayoutGraphics.proto";
 
 package pslGraphicData;
-option go_package = "./ats/verify/protos/graphicData";
+option go_package = "joylink.club/bj-rtsts-server/dto/data_proto";
 
 message PslGraphicStorage {
   graphicData.Canvas canvas = 1;

protos/relayCabinetLayoutGraphics.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 import "stationLayoutGraphics.proto";
 
 package relayCabinetGraphicData;
-option go_package = "./ats/verify/protos/graphicData";
+option go_package = "joylink.club/bj-rtsts-server/dto/data_proto";
 
 message RelayCabinetGraphicStorage {
  graphicData.Canvas canvas = 1;
@@ -12,7 +12,10 @@ message RelayCabinetGraphicStorage {
  //string belongsConcentrationStation = 5;//继电器柜图所属集中站
  UniqueIdType UniqueIdPrefix = 6;//设备唯一编码--前缀
  repeated PhaseFailureProtector phaseFailureProtectors = 7;
- repeated Combinationtype combinationtypeList = 8;
+ //repeated Combinationtype combinationtypeList = 8;
+ repeated SignalFaultAlarm signalFaultAlarms = 9;
+ CiCj ciCjList = 10;//采集列表
+ CiQd ciQdList = 11;//驱动列表
 }
 
 message RelayCabinet {
@@ -36,6 +39,8 @@ message Relay {
   string code = 2;//编号
   //string model = 3;//型号
   ModelType newModel = 4;//型号
+  string showCode = 5;//展示的编号
+  CjDataItem.PostionType defaultInitialPosition = 6;//默认初始位置
 }
 
 /* 断相保护器 */
@@ -44,6 +49,12 @@ message PhaseFailureProtector {
   string code = 2;//编号
 }
 
+/* 信号机故障报警仪 */
+message SignalFaultAlarm {
+  graphicData.CommonInfo common = 1;
+  string code = 2;//编号
+}
+
 /* 设备管理的继电器列表 */
 message DeviceRelateRelay {
   //int32 id = 1;//存储在列表中的id
@@ -55,7 +66,8 @@ message DeviceRelateRelay {
 }
 message Combinationtype {
   string code = 1;
-  repeated string refRelays = 2;//设备关联的继电器
+  //repeated string oldrefRelays = 2;//设备关联的继电器
+  repeated uint32 refRelays = 3;//设备关联的继电器
 }
 
 message UniqueIdType {
@@ -63,3 +75,45 @@ message UniqueIdType {
   string lineId = 2;//线路号
   string belongsConcentrationStation = 3;//继电器柜图所属集中站
 }
+
+/* 采集 */
+message CiCj {
+  int32 dsCount = 1;//数据集位数——对应着excel表行数
+  repeated CjDataSet cjList = 2;//采集列表（二维数据，数组长度对应着excel表列数--数据集个数）
+}
+
+message CjDataSet {
+  string name = 1;//对应着excel中的列名，如'D1'
+  repeated CjData bitList = 2;//对应着excel中的一列的数据
+}
+
+message CjData {
+  repeated CjDataItem refRelays=1;//采集的继电器
+}
+
+message CjDataItem {
+  enum PostionType {
+      Q=0;
+      H=1;
+      NONE=2;
+  }
+  //string oldrelayId = 1;//采集对应的继电器Id
+  PostionType position = 2;//继电器的位置，QH对应着吸合
+  uint32 relayId = 3;//采集对应的继电器Id
+}
+
+/* 驱动 */
+message CiQd {
+  int32 dsCount = 1;//数据集位数——对应着excel表行数
+  repeated QdDataSet qdList = 2;//驱动列表（二维数据，数组长度对应着excel表列数--数据集个数）
+}
+
+message QdDataSet {
+  string name = 1;//对应着excel中的列名，如'D1'
+  repeated QdData bitList = 2;//对应着excel中的一列的数据
+}
+
+message QdData {
+  //repeated string oldrefRelays=1;//驱动的继电器Id
+  repeated uint32 refRelays=2;//驱动的继电器Id
+}

protos/request.proto

@@ -1,57 +1,290 @@
 syntax = "proto3";
 
-import "device_state.proto";
-
 package request;
-option go_package = "./dto/request_proto";
+option go_package = "joylink.club/bj-rtsts-server/dto/request_proto";
+/*
+message BypassOperationReq{
+  enum Operation{
+    bypass = 0;  //旁路
+    bypass_reset = 1; // 旁路重置
+  }
+  enum BtnType{
+      esb_btn = 0;
+      ibp_btn = 1;
+      ibp_key = 2;
+      pls_btn = 3;
+  }
+  string simulationId = 1;         // 仿真id
+  int32 mapId = 2;                 // 图id
+  uint32 deviceId = 3;             // 设备id
+  string deviceCode = 5;//设备code
+  uint32 stationId = 6; //车站id
+  uint32 gateBoxId = 7;
+  BypassOperationReq.Operation operation = 8;
+    BypassOperationReq.BtnType btnType = 9;
+}
+*/
+
+// 继电器
+message Relay {
+  // 继电器操作
+  enum Operation {
+    Undefined = 0; // 未定义
+    ForceQw = 1;   // 强制前接点位(吸起)
+    ForceHw = 2;   // 强制后接点位(落下)
+    CancelForce = 3; // 取消强制
+  }
+}
+
+// 继电器操作请求
+message RelayOperationReq {
+  string simulationId = 1;         // 仿真id
+  int32 mapId = 2;                 // 图id
+  uint32 deviceId = 3;             // 设备id
+  Relay.Operation operation = 4;   // 继电器操作
+}
 
 // 道岔
-message Turnout {
-    // 道岔操作
-    enum Operation {
-        Undefined = 0; // 未定义
-        DC = 1; // 定操
-        CancelDC = 2; // 取消定操
-        FC = 3; // 反操
-        CancelFC = 4; // 取消反操
-        SetSB = 5; // 设置失表故障
-        CancelSB = 6; // 取消失表故障
-        SetJC = 7; // 设置挤岔故障
-        CancelJC = 8; // 取消挤岔故障
-    }
+message Points {
+  // 道岔操作
+  enum Operation {
+    Undefined = 0; // 未定义
+    SetParams = 1; // 设置参数
+  }
+  // 道岔强制
+  enum Force {
+    FP_NONE = 0; // 无强制
+    FP_DW = 1;   // 定位
+    FP_FW = 2;   // 反位
+    FP_SB = 3;  // 失表
+  }
 }
 
 // 道岔操作请求
-message TurnoutOperationReq {
-    string simulationId = 1; // 仿真id
-    int32 mapId = 2; // 图id
-    string deviceId = 3; // 设备id
-    Turnout.Operation operation = 4; // 道岔操作
+message PointsOperationReq {
+  string simulationId = 1;         // 仿真id
+  int32 mapId = 2;                 // 图id
+  uint32 deviceId = 3;             // 设备id
+  Points.Operation operation = 4; // 道岔操作
+  PointsParam param = 5; // 道岔参数,当operation为SetParams时有效
+}
+
+// 道岔参数
+message PointsParam {
+  Points.Force forcePosition = 1; // 道岔强制
 }
 
 // 信号机
-message Signal{
-    //信号机操作
-    enum Operation{
-        Undefined = 0; // 未定义
-        Display = 1; //显示操作,如设置绿色、设置红黄色
-        LightHFaultDs = 2;//设置红灯断丝故障
-        LightUFaultDs = 3;//设置黄灯断丝故障
-        LightLFaultDs = 4;//设置绿灯断丝故障
-        LightAFaultDs = 5;//设置蓝灯断丝故障
-        LightBFaultDs = 6;//设置白灯断丝故障
-        LightHCancelDs = 7;//取消红灯断丝故障
-        LightUCancelDs = 8;//取消黄灯断丝故障
-        LightLCancelDs = 9;//取消绿灯断丝故障
-        LightACancelDs = 10;//取消蓝灯断丝故障
-        LightBCancelDs = 11;//取消白灯断丝故障
-    }
+message Signal {
+  //信号机操作
+  enum Operation {
+    Undefined = 0;       // 未定义
+    SetParams = 1; // 设置参数
+    // Display = 1;         //显示操作,如设置绿色、设置红黄色
+    // LightHFaultDs = 2;   //设置红灯断丝故障
+    // LightUFaultDs = 3;   //设置黄灯断丝故障
+    // LightLFaultDs = 4;   //设置绿灯断丝故障
+    // LightAFaultDs = 5;   //设置蓝灯断丝故障
+    // LightBFaultDs = 6;   //设置白灯断丝故障
+    // LightHCancelDs = 7;  //取消红灯断丝故障
+    // LightUCancelDs = 8;  //取消黄灯断丝故障
+    // LightLCancelDs = 9;  //取消绿灯断丝故障
+    // LightACancelDs = 10; //取消蓝灯断丝故障
+    // LightBCancelDs = 11; //取消白灯断丝故障
+  }
+  enum DS {
+    DS_H = 0; // 红灯断丝
+    DS_U = 1; // 黄灯断丝
+    DS_L = 2; // 绿灯断丝
+    DS_A = 3; // 蓝灯断丝
+    DS_B = 4; // 白灯断丝
+  }
+  // 信号机强制
+  enum Force {
+    SF_NONE = 0; // 无强制
+    SF_M = 1; // 灭灯
+    SF_H = 2;  // 红灯
+    SF_U = 3; // 黄灯
+    SF_L = 4; // 绿灯
+    SF_HU = 5; // 红黄灯
+    SF_A = 6; // 蓝灯
+    SF_B = 7; // 白灯
+  }
 }
-// 信号机操作请求
+
 message SignalOperationReq {
-    string simulationId = 1; // 仿真id
-    int32 mapId = 2; // 图id
-    string deviceId = 3; // 设备id
-    Signal.Operation operation = 4; // 信号机操作
-    state.Signal.Aspect  aspect = 5;// 当操作为Operation.Display时有效，表示显示的信号
-}
+  string simulationId = 1;         // 仿真id
+  int32 mapId = 2;                 // 图id
+  uint32 deviceId = 3;             // 设备id
+  Signal.Operation operation = 4; // 信号机操作
+  SignalParam param = 5; // 信号机参数,当operation为SetParams时有效
+}
+
+message SignalParam {
+  Signal.Force force = 1; // 信号机强制
+  repeated Signal.DS dsList = 2; // 信号机断丝
+}
+
+// 区段
+message Section {
+  //区段操作
+  enum Operation {
+    Undefined = 0; // 未定义
+    SetParams = 1; // 设置参数
+    // SetDrst = 0;//设置计轴直接复位
+    // CancelDrst = 1;//取消计轴直接复位
+    // SetPdrst = 2;//设置计轴预复位
+    // CancelPdrst = 3;//取消计轴预复位
+    SetFaultOcc = 4;    //设置故障占用
+    // CancelFaultOcc = 5; //取消故障占用
+  }
+}
+
+message SectionOperationReq {
+  string simulationId = 1;         // 仿真id
+  int32 mapId = 2;                 // 图id
+  uint32 deviceId = 3;             // 设备id
+  Section.Operation operation = 4; // 区段操作
+  SectionParam param = 5;          // 区段参数,当operation为SetParams时有效
+}
+
+message SectionParam {
+  // bool faultOcc = 1; // 故障占用
+  bool mockDrst = 2; // 模拟CI计轴复位(临时)
+  bool mockPdrst = 3; // 模拟CI计轴预复位(临时)
+}
+
+//屏蔽门
+message Psd {
+  enum Operation {
+    Undefined = 0;
+    SetParams = 1; // 设置参数
+  }
+  enum Force {
+    F_NONE = 0; //无强制
+    F_ASD_KM = 1; //滑动门强制开门
+    F_ASD_GM = 2; //滑动门强制关门
+  }
+  enum Fault {
+    FA_NONE = 0; //无故障
+    FA_Obstacle = 1; //设置故障物
+  }
+}
+
+// 屏蔽门操作请求
+message PsdOperationReq {
+  string simulationId = 1;         // 仿真id
+  int32 mapId = 2;                 // 图id
+  uint32 deviceId = 3;             // 设备id
+  Psd.Operation operation = 4; // 操作
+  PsdParam param = 5; // 屏蔽门参数,当operation为SetParams时有效
+}
+
+message PsdParam {
+  repeated int32 asdCodes = 1; // 涉及的滑动门的编号
+  Psd.Force force = 2; // 屏蔽门强制设置
+  Psd.Fault fault = 3; // 屏蔽门故障设置
+}
+
+//列车控制
+message TrainControl{
+  string simulationId = 1;         // 仿真id
+  string trainId = 2;
+  uint32 deviceId = 3;//设备id
+  TrainControlType controlType = 4;
+  ControlButton controlButton = 5; // 控制按钮
+  DriverKeySwitch driverKey = 6;
+  SwitchKeyChange switchKey = 7; //方向/门模式
+  PushHandler handler = 8; //手柄
+
+
+  message ControlButton{
+    bool active = 1;
+  }
+  enum TrainControlType{
+    EMERGENT_BUTTON = 0; // 摁钮
+    DRIVER_KEY_SWITCH = 1; //驾驶端钥匙
+    DIRECTION_KEY_SWITCH = 2;//方向钥匙
+    HANDLER = 3; //手柄
+    TRAIN_DOOR_MODE_CHANGE =4;//列车门模式
+  }
+  enum KeyLocation{
+    KL_END = 0; //方向：后退 门模式:mm模式
+    KL_FONT = 1; //方向：前进 门模式:AA模式
+    KL_CENTER = 2;//方向：中位 门模式:AM模式
+  }
+
+  //紧急制动
+  message EmergentButton{
+    bool active = 1;
+  }
+
+  //驾驶
+  message DriverKeySwitch{
+      bool val = 1;  //0=关，1=开
+
+
+  }
+  message  SwitchKeyChange{
+    uint32 val = 1;  //0=后(门模式:MM)，1=前(门模式:AA),2=中位(门模式:AM)
+  }
+  //牵引或制动手柄
+  message PushHandler{
+    int32 val = 1; // 牵引或制动 大于0是牵引，小于0是制动 整体按照整型传输(*100)，使用时除以100
+  }
+
+}
+
+
+
+message CkmOperationReq {
+  string simulationId = 1;
+  int32 mapId = 2;
+  uint32 deviceId = 3; //设备id（车库门id）
+  Ckm.Operation operation = 4; //车库门操作
+  CkmParam param = 5; //车库门参数，在operation为SetParams时有效
+}
+
+message Ckm {
+  enum Operation {
+    Undefined= 0;
+    SetParams = 1;
+  }
+  enum Force {
+    F_NONE = 0; //无强制
+    F_KM = 1; //强制开门
+    F_GM = 2; //强制关门
+  }
+  enum Fault {
+    FA_NONE = 0; //无故障
+    FA_State_Loss = 1; //状态丢失
+  }
+}
+
+message CkmParam {
+  Ckm.Force force = 1;
+  Ckm.Fault fault = 2;
+}
+
+message XcjOperationReq {
+  string simulationId = 1;
+  int32 mapId = 2;
+  uint32 deviceId = 3; //设备id（洗车机id）
+  Xcj.Operation operation = 4;
+  XcjParam param = 5; //洗车机参数，在operation为SetParams时有效
+}
+
+message Xcj {
+  enum Operation {
+    Undefined= 0;
+    SetParams = 1;
+  }
+  enum Fault {
+    FA_NONE = 0; //无故障
+    FA_Fault = 1; //故障
+  }
+}
+
+message XcjParam {
+  Xcj.Fault fault = 1;
+}

protos/stationLayoutGraphics.proto

@@ -1,9 +1,11 @@
 syntax = "proto3";
 
+
 package graphicData;
+import "common_data.proto";
 option java_package = "club.joylink.bjrtss.ats.verify.protos";
 option java_outer_classname = "LayoutGraphicsProto";
-option go_package = "./ats/verify/protos/graphicData";
+option go_package = "joylink.club/bj-rtsts-server/dto/data_proto";
 
 message RtssGraphicStorage {
   Canvas canvas = 1;
@@ -12,11 +14,11 @@ message RtssGraphicStorage {
   repeated Platform Platforms = 4;
   repeated Station stations = 5;
   // repeated Rect rects = 6;
-  // repeated Train train = 7;
+  repeated Train train = 7;
   repeated Signal signals = 8;
   repeated Turnout turnouts = 9;
   repeated Section section = 10;
-  // repeated Polygon polygons = 11;
+  repeated Polygon polygons = 11;
   repeated TrainWindow trainWindows = 12;
   repeated AxleCounting axleCountings = 13;
   repeated Separator separators = 14;
@@ -25,21 +27,39 @@ message RtssGraphicStorage {
   repeated LogicSection logicSections = 17;
   repeated StopPosition stopPositions = 18;
   repeated SpksSwitch spksSwitchs = 19;
-  repeated EsbButton esbButtons = 20; // 紧急关闭按钮
+  repeated EsbButton esbButtons = 20; // 紧急关闭（这不是按钮，只是一个ESB系统的象征物）
   repeated GatedBox gateBoxs = 21; // 站台开门/关门/发车按钮整合控制箱
   repeated Transponder transponders = 22;                // 应答器
   repeated Slope slopes = 23;                            // 坡度
-  repeated CalculateLink CalculateLink = 24;             // 计算link信息
+  // repeated CalculateLink CalculateLink = 24;             // 计算link信息
   repeated SlopeKiloMarker slopeKiloMarker = 25;         //坡度公里标
   repeated CurvatureKiloMarker curvatureKiloMarker = 26; //曲度公里标
   repeated Curvature curvatures = 27;                    // 曲度
   repeated TrackSection trackSections = 28;              //轨道区段
   repeated TrackLogicSection trackLogicSections = 29;    //轨道逻辑区段
   //UniqueIdType UniqueIdPrefix = 30;//设备唯一编码--前缀
-  UniqueIdOfStationLayout UniqueIdPrefix = 31;//设备唯一编码--前缀
+  UniqueIdOfStationLayout UniqueIdPrefix = 31;//地图唯一信息
   repeated KilometerConvert kilometerConvertList = 32;//公里标转换列表
   repeated ScreenDoor screenDoors = 33;
   repeated StationRelateDevice stationRelateDeviceList = 34; // 关联设备列表
+  repeated SectionCodePoint sectionCodePointList = 35; // 物理区段码位表
+  ScreenDoorConfig screenDoorConfig = 36;//屏蔽门的配置--子屏蔽门的数量和编组列表
+  repeated Beacon beacons = 37; // 信标
+  GenerateAxleCountingConfig generateAxleCountingConfig = 38;//一键生成计轴的配置
+  repeated DepartureTimer departureTimers = 39; // 发车计时器
+  repeated AutoReturnBox autoReturnBoxs = 40; // 自动折返按钮箱
+  repeated ConcentrationDividingLine concentrationDividingLines = 41; // 集中区分割线
+  repeated OtherLine otherLineList = 42; // 其他线设备列表
+  repeated IbpBox ibpBoxs = 43; // ibp地图打开按钮
+  repeated PslBox pslBoxs = 44; // psl地图打开按钮
+  repeated CarWashing carWashings = 45; // 洗车机
+  repeated GarageDoor garageDoors = 46; // 车库门
+  repeated GarageDoor floodGates = 47; // 防淹门
+  //repeated GarageDoorBox garageDoorBoxes = 48; //车库门Psl开启按钮
+  LianSuoData lianSuoData = 49; // 联锁映射数据
+  repeated HoldButton holdButtons = 50; // 扣车按钮
+  repeated UnattengedButton unattengedButtons = 51; //无人折返按钮
+  repeated KilometerMarkCalibration kilometerMarkCalibrations = 52; //公里标校准数据
 }
 
 message Canvas {
@@ -51,6 +71,15 @@ message Canvas {
   string backgroundColor = 3;
   // 视口变换
   Transform viewportTransform = 4;
+  //画布格子背景
+  Grid gridBackground = 5;
+}
+
+//格子背景
+message Grid {
+  bool hasGrid = 1;
+  string lineColor = 2; // 线色
+  int32 space = 3; //间隔
 }
 
 message Point {
@@ -81,10 +110,11 @@ message ChildTransform {
 }
 // 公共属性
 message CommonInfo {
-  string id = 1;
+//  string oldid = 1;
   string graphicType = 2;
   Transform transform = 3;
   repeated ChildTransform childTransforms = 4;
+  uint32 id = 5;
 }
 
 // message Link {
@@ -108,33 +138,67 @@ message CommonInfo {
 //   Point point = 8;      // 画第一个点的坐标
 // }
 
-// message Polygon {
-//   CommonInfo common = 1;
-//   string code = 2;
-//   int32 lineWidth = 3;       // 线宽
-//   string lineColor = 4;      // 线色
-//   repeated Point points = 5; // 点坐标列表
-// }
+message Polygon {
+  enum PolygonType {
+    ConcentrationDividingLine = 0;
+  }
+  CommonInfo common = 1;
+  string code = 2;           // 编号
+  PolygonType polygonType = 3; // 多边形类型
+  repeated Point points = 4; // 点列表
+}
+
+message ConcentrationDividingLine {
+  CommonInfo common = 1;
+  string code = 2;           // 编号
+  repeated Point points = 3; // 点列表
+  //string oldrefLeftStationId = 4;//左边关联的集中站id
+  //string oldrefRightStationId = 5;//右边关联的集中站id
+  repeated NodeConWithSec nodeConWithSecs = 6;// 集中区分割线与区段的交点
+  bool isOtherLineConcentrationDividingLine = 7;//集中区分割线绘制在其它线的边界处
+  uint32 refLeftStationId = 8;//左边关联的集中站id
+  uint32 refRightStationId = 9;//右边关联的集中站id
+}
+
+message NodeConWithSec {
+ RelatedRef leftSection = 1;
+ RelatedRef rightSection = 2;
+}
 
 message Platform {
+  enum TypeOfPlatform {
+    Unknown = 0;
+    up = 1;
+    down = 2;
+  }
   CommonInfo common = 1;
   string code = 2;
   //bool hasdoor = 3;          // 是否有屏蔽门
   //string direction = 4;      // 屏蔽门上下
-  int32 index = 5;           //索引
+  // int32 index = 5;           //索引
   //int32 refStationIndex = 6; //关联车站索引
   // repeated string centralizedStations = 7; // 集中站列表
   //repeated RelatedRef platformRef = 8; //站台关联的车站和物理区段
-  string refStationId = 9; //关联的车站的id
-  string refSectionId = 10; //关联的物理区段id
+  //string oldrefStationId = 9; //关联的车站的id
+  //string oldrefSectionId = 10; //关联的物理区段id
+  string refEsbRelayCode = 11;//关联的紧急停车继电器的编号
+  TypeOfPlatform type = 12; //站台的上下行
+  uint32 refStationId = 13; //关联的车站的id
+  uint32 refSectionId = 14; //关联的物理区段id
 }
 
 message ScreenDoor {
   CommonInfo common = 1;
   string code = 2;
-  int32 sonDoorAmount = 3; //子屏蔽门的数量
-  string refPlatformId = 4; //关联的站台
-  repeated ScreenDoorGroup screenDoorGroupList = 5;//编组列表
+  //int32 sonDoorAmount = 3; //子屏蔽门的数量
+  //string oldrefPlatformId = 4; //关联的站台
+  //repeated ScreenDoorGroup screenDoorGroupList = 5;//编组列表
+  uint32 refPlatformId = 6; //关联的站台
+}
+
+message ScreenDoorConfig {
+  int32 sonDoorAmount = 1; //子屏蔽门的数量
+  repeated ScreenDoorGroup screenDoorGroupList = 2;//编组列表
 }
 
 message ScreenDoorGroup {
@@ -145,19 +209,24 @@ message ScreenDoorGroup {
 
 message Station {
   CommonInfo common = 1;
-  string code = 2;
+  string code = 2;//车站站名
   // bool hasControl = 3;            // 是否有控制
   bool concentrationStations = 4; //是否集中站
   // string kilometerCode = 5;       //公里标
   KilometerSystem kilometerSystem = 6; //公里标
-  int32 index = 7;
-  string refIbpMapCode = 8; // 关联IBP地图Code
+  // int32 index = 7;
+  //string refIbpMapCode = 8; // 关联IBP地图Code
+  string stationName = 9; //车站名
+  string stationNameAcronym = 10; //  车站名拼音简写
+  bool depots = 11; //是否车辆段
+  //repeated string oldmanageStations = 12; // 如果是集中站——管理的车站-id
+  repeated uint32 manageStations = 13; // 如果是集中站——管理的车站-id
 }
 
 message TrainWindow {
   CommonInfo common = 1;
   string code = 2;
-  string sectionId = 3;
+  int32 sectionId = 3;
 }
 
 message AxleCounting {
@@ -168,12 +237,19 @@ message AxleCounting {
   CommonInfo common = 1;
   string code = 2;                     // 名称
   KilometerSystem kilometerSystem = 3; //公里标
-  repeated RelatedRef axleCountingRef =
-      4; // 计轴关联的非岔区物理区段和道岔，设备id和端口
-  int32 index = 5;             //计轴的索引编号
+  repeated RelatedRef axleCountingRef = 4; // 计轴关联的非岔区物理区段和道岔，设备id和端口
+  // int32 index = 5;             //计轴的索引编号
   //bool invent = 6;             //是否虚拟计轴--一般是最末端
   TypeDetectionPoint type = 7; //检测点的类型：计轴、区段边界
-  repeated string centralizedStations = 8; // 集中站列表
+  //repeated string oldcentralizedStations = 8; // 集中站Id列表
+  repeated uint32 centralizedStations = 9; // 集中站Id列表
+}
+
+message GenerateAxleCountingConfig {
+  //repeated string oldbbConnect = 1; //需要在道岔bb连接处生成计轴的道岔id(填一个就行)
+  //repeated string oldnoGenerateGroup = 2;//指定的道岔组不生成计轴
+  repeated uint32 bbConnect = 3; //需要在道岔bb连接处生成计轴的道岔id(填一个就行)
+  repeated uint32 noGenerateGroup = 4;//指定的道岔组不生成计轴
 }
 
 // message Train {
@@ -204,21 +280,25 @@ message Turnout { //(后端不关注)
   RelatedRef pcRef = 11;     // 道岔C端关联的设备
   // KilometerSystem kilometerSystem = 12; // 道岔公里标
   repeated KilometerSystem kilometerSystem = 13; // 道岔公里标
-  int32 index = 14;                              //索引
-  string paTrackSectionId = 15;                  // A端轨道区段id
-  string pbTrackSectionId = 16;                  // B端轨道区段id
-  string pcTrackSectionId = 17;                  // C端轨道区段id
+  // int32 index = 14;                              //索引
+  //string oldpaTrackSectionId = 15;                  // A端轨道区段id
+  //string oldpbTrackSectionId = 16;                  // B端轨道区段id
+  //string oldpcTrackSectionId = 17;                  // C端轨道区段id
   SwitchMachineType switchMachineType = 18;      // 转辙机类型
-  repeated string centralizedStations = 19; // 集中站列表
+  //repeated string oldcentralizedStations = 19; // 集中站Id列表
+  repeated uint32 centralizedStations = 20; // 集中站Id列表
+  uint32 paTrackSectionId = 21;                  // A端轨道区段id
+  uint32 pbTrackSectionId = 22;                  // B端轨道区段id
+  uint32 pcTrackSectionId = 23;                  // C端轨道区段id
 }
 
-/** 左右行 **/
-enum Direction {
-  LEFT = 0;
-  RIGHT = 1;
-}
 
 message KilometerSystem {
+  /** 左右行 **/
+  enum Direction {
+    LEFT = 0;
+    RIGHT = 1;
+  }
   int64 kilometer = 1;         //公里标mm
   string coordinateSystem = 2; //坐标系
   Direction direction = 3;     //左右行
@@ -231,9 +311,35 @@ message Signal {
   // int64 kilometer = 4;
   // string coordinateSystem = 5;
   KilometerSystem kilometerSystem = 6;
-  int32 index = 7;       //索引
+  // int32 index = 7;       //索引
   RelatedRef refDev = 8; //关联设备（区段/道岔）
-  repeated string centralizedStations = 9; // 集中站列表
+  //repeated string oldcentralizedStations = 9; // 集中站Id列表
+  // 信号机模型类型枚举
+  // 从左向右，最左边为靠近灯座的灯
+  // 如果没有说明，默认不封灯，无引导
+  // F-封 D-单 Y-有、带 Y-引导
+  // H-红 L-绿 U-黄 A-蓝 B-白
+  enum Model{
+     HL = 0;          //2XH-1       红绿
+     HLU_FU = 1;      //2XH-1       红绿黄,封黄灯，无引导
+     HLU_DU_YY = 2;   //3XH-1       红绿黄,不封灯，有单黄，带引导
+     HLU_YY = 3;      //3XH-2或JDXH 红绿黄,不封灯，无单黄，带引导
+     HLU_FL_DU_YY = 4;//3XH-3       红绿黄,封绿灯，有单黄，带引导
+     HLU_DU = 5;      //3XH-4       红绿黄,不封灯，有单黄，无引导
+     AB = 6;          //DXCH        蓝白
+     HBU_DU = 7;      //JCKXH       红白黄,不封灯，有单黄，无引导
+  }
+  // 信号机模型类型
+  Model mt = 10;
+  //string belongStation = 11; // 所属车站(缩写)
+  Direction direction = 12; // 上下行
+  repeated uint32 centralizedStations = 13; // 集中站Id列表
+}
+
+/** 上下行（区段/信号机） */
+enum Direction {
+  UP = 0;
+  DOWN = 1;
 }
 
 /** 物理区段(包含岔区和非岔区) */
@@ -243,31 +349,52 @@ message Section {
     TurnoutPhysical = 2;
   }
 
+  enum RunningDirection {
+    AtoB = 0;
+    BtoA = 1;
+    BOTH = 2;
+  }
+
+
   CommonInfo common = 1;
   string code = 2;           // 编号
   repeated Point points = 3; // 点列表
   RelatedRef paRef = 4; // 区段A端关联的设备(非岔区)(后端不关注)
   RelatedRef pbRef = 5; // 区段B端关联的设备(非岔区)(后端不关注)
   SectionType sectionType = 6;       // 区段类型
-  repeated string axleCountings = 7; // 区段对应的计轴
-  int32 index = 8;                   // 索引
-  string trackSectionId = 9;         // 下属轨道区段id
+  //repeated string oldaxleCountings = 7; // 区段对应的计轴
+  // int32 index = 8;                   // 索引
+  //string oldtrackSectionId = 9;         // 下属轨道区段id
   bool isCurve = 10;                 // 是否曲线
   int32 segmentsCount = 12;          // 曲线分段数
-  repeated string centralizedStations = 13; // 集中站列表
+  //repeated string oldcentralizedStations = 13; // 集中站Id列表
+  RunningDirection normalRunningDirection = 14; //常规运行方向
+  bool isTurnBackZone = 15; // 是否为折返区域
+  Direction direction = 16; // 上下行
+  repeated uint32 axleCountings = 17; // 区段对应的计轴
+  uint32 trackSectionId = 18;         // 下属轨道区段id
+  repeated uint32 centralizedStations = 19; // 集中站Id列表
 }
 
 //关联设备
 message RelatedRef {
   enum DeviceType {
-    Section = 0;
-    Turnout = 1;
-    TrainWindow = 2;
-    AxleCounting = 3;
+    Section = 0; //区段
+    Turnout = 1; //道岔
+    TrainWindow = 2; //车次窗
+    AxleCounting = 3; //计轴器
     SectionLink = 4;
     signal = 5;
     station = 6;
     ScreenDoor = 7;
+    SignalFaultAlarm = 8;
+    Breakers = 9;//断路器
+    PowerScreen = 10;//电源屏
+    GarageDoor = 11; //车库门
+    CarWashing = 12; //洗车机
+    FloodGate = 13; //防淹门
+    Platform = 14; //站台
+    LS = 15;//
   }
 
   enum DevicePort {
@@ -277,14 +404,16 @@ message RelatedRef {
   }
 
   DeviceType deviceType = 1; //关联的设备类型
-  string id = 2;             //关联的设备ID
+  //string oldid = 2;             //关联的设备ID
   DevicePort devicePort = 3; //关联的设备端口
+  uint32 id = 4;
 }
 
 //计轴区段与道岔的位置关系
 message TurnoutPosRef {
-  string id = 1;      //道岔的ID
+  //string oldid = 1;      //道岔的ID
   int32 position = 2; //道岔的正反为，0是定位，1是反位
+  uint32 id = 3;
 }
 
 message Separator { // 分隔符
@@ -294,13 +423,28 @@ message Separator { // 分隔符
 }
 
 message Transponder { // 应答器
+  enum TransponderTypeEnum {
+    FB = 0; // 固定应答器
+    WB = 1; // 轮径校正应答器
+    DB = 2; // 休眠唤醒应答器
+    VB = 3; // 主信号应答器
+    IB = 4; // 预告应答器
+  }
   CommonInfo common = 1;
   string code = 2;
-  int32 transponderType = 3;
-  int32 index = 4;                     // 索引编号
+  // int32 transponderType = 3; // 作废
+  // int32 index = 4;                     // 索引编号
   KilometerSystem kilometerSystem = 5; //公里标
   RelatedRef TransponderRef = 6;       //关联关系
-  repeated string centralizedStations = 7; // 集中站列表
+  //repeated string oldcentralizedStations = 7; // 集中站Id列表
+  // bytes fixedTelegram = 8;//无源应答器固定报文
+  TransponderTypeEnum type = 9;//应答器类型
+  repeated uint32 centralizedStations = 10; // 集中站Id列表
+  string fixedTelegram = 11; //应答器固定报文
+  string fixedUserTelegram = 12; //应答器固定用户报文
+  string originalCode = 13; //应答器原编号（厂商提供数据编号）
+  uint32 leuIndex = 14; //应答器所属LEU的索引
+  uint32 leuInsideIndex = 15; // 应答器在LEU内部的索引
 }
 
 message SimpleRef {
@@ -309,7 +453,8 @@ message SimpleRef {
     AxleCounting = 1;
   }
   DeviceType deviceType = 1;
-  string id = 2;
+  //string oldid = 2;
+  uint32 id = 3;
 }
 
 message SectionLink {
@@ -325,7 +470,7 @@ message SectionLink {
       7; // SectionLink A端连接设备（端口关系 SectionLink/Turnout）
   RelatedRef bRef = 8; // SectionLink B端连接设备（端口关系
                        // SectionLink/Turnout）
-  int32 index = 9;     // 索引编号
+  // int32 index = 9;     // 索引编号
 }
 
 message AxleCountingSection { // 计轴区段
@@ -335,16 +480,18 @@ message AxleCountingSection { // 计轴区段
   RelatedRef paRef = 4;                  // 计轴区段A端关联的计轴
   RelatedRef pbRef = 5;                  // 计轴区段B端关联的计轴
   repeated TurnoutPosRef turnoutPos = 6; //关联道岔的正反位--0是定位，1是反位
-  int32 index = 7;                       //计轴区段的索引编号
+  // int32 index = 7;                       //计轴区段的索引编号
 }
 
 message LogicSection { // 逻辑区段
   CommonInfo common = 1;
   string code = 2; // 名称
   repeated Point points = 3;
-  string axleSectionId = 4; // 关联的计轴区段Id
-  int32 index = 5;          // 索引编号
-  string turnoutId = 6; // 关联的岔芯对应的道岔id，此时该逻辑区段为该道岔C端关联的轨道link
+  //string oldaxleSectionId = 4; // 关联的计轴区段Id
+  // int32 index = 5;          // 索引编号
+  //string oldturnoutId = 6; // 关联的岔芯对应的道岔id，此时该逻辑区段为该道岔C端关联的轨道link
+  uint32 axleSectionId = 7; // 关联的计轴区段Id
+  uint32 turnoutId = 8; // 关联的岔芯对应的道岔id，此时该逻辑区段为该道岔C端关联的轨道link
 }
 
 message TrackSection { //轨道区段
@@ -355,13 +502,14 @@ message TrackSection { //轨道区段
   CommonInfo common = 1;
   repeated Point points = 2;
   string code = 3;                       //名称
-  int32 index = 4;                       //索引
+  // int32 index = 4;                       //索引
   TrackSectionType type = 5;             //类型
   string destinationCode = 6;            //目的地码
-  repeated string trackLogicSection = 7; //下属的逻辑区段id(非岔区)
+  //repeated string oldtrackLogicSection = 7; //下属的逻辑区段id(非岔区)
   //   //关联的物理设备id(物理区段/道岔)由另一端(物理区段/道岔处理)
   bool isCurve = 8;        // 是否曲线
   int32 segmentsCount = 9; // 曲线分段数
+  repeated uint32 trackLogicSection = 10; //下属的逻辑区段id(非岔区)
 }
 
 message TrackLogicSection { //轨道逻辑区段
@@ -381,7 +529,7 @@ message StopPosition {
   string code = 2;
   bool flip = 3;         // 是否翻转（前端显示）
   CoachNum coachNum = 4; //编组数量
-  int32 index = 5;       //索引
+  // int32 index = 5;       //索引
   KilometerSystem kilometerSystem = 6;
   RelatedRef refDev = 7; // 关联设备（区段）
 }
@@ -390,28 +538,47 @@ message SpksSwitch {
   CommonInfo common = 1;
   string code = 2;
   bool flip = 3;                   // 是否翻转（前端显示）
-  int32 index = 4;                 //索引
+  // int32 index = 4;                 //索引
   // int32 refStand = 5;              //关联站台索引
-  repeated string refSections = 6; // 关联物理区段id
-  string refStand = 7; // 关联站台
+  //repeated string oldrefSections = 6; // 关联物理区段id
+  //string oldrefStand = 7; // 关联站台
+  // repeated uint32 refSections = 8; // 关联物理区段id
+  uint32 refStand = 9; // 关联站台
 }
 
 message EsbButton {
   CommonInfo common = 1;
   string code = 2;
   bool flip = 3;      // 是否翻转（前端显示）
-  int32 index = 4;    //索引
+  // int32 index = 4;    //索引
   // int32 refStand = 5; // 关联站台索引
-  string refStand = 6; // 关联站台
+  //string oldrefStand = 6; // 关联站台
+  uint32 refStand = 7; // 关联站台
+  //string refEsbButtonMapCode = 8; // 关联紧急关闭按钮地图Code--关联PSL地图
 }
 
 message GatedBox {
   CommonInfo common = 1;
   string code = 2;
   bool flip = 3;   // 是否翻转（前端显示）
-  int32 index = 4; //索引
-  string refScreenDoor = 5; // 关联屏蔽门
+  // int32 index = 4; //索引
+  //string oldrefScreenDoor = 5; // 关联屏蔽门
   string refGatedBoxMapCode = 6; // 关联门控箱地图Code
+  uint32 refScreenDoor = 7; // 关联屏蔽门
+}
+
+message IbpBox {
+  CommonInfo common = 1;
+  string code = 2;
+  string refIbpMapCode = 3; // 关联Ibp地图Code
+  uint32 refStationId = 4; // 关联车站id
+}
+
+message PslBox {
+  CommonInfo common = 1;
+  string code = 2;
+  string refPslMapCode = 3; // 关联Psl地图Code
+  uint32 refPlatformId = 4; // 关联站台id
 }
 
 /** 坡度公里标 */
@@ -427,40 +594,88 @@ message CurvatureKiloMarker {
   string code = 2;
   repeated KilometerSystem kilometerSystem = 4; //公里标数据
 }
+/** 车库门 */
+message GarageDoor {
+  CommonInfo common = 1;
+  string code = 2;
+  uint32 linkSection = 3; //关联区段
+  repeated uint32 centralizedStations = 4; // 集中站Id列表;
+  string refPslMapCode = 5; // 关联的Psl地图的code（名称）
+}
+/** 洗车机 */
+message CarWashing {
+  CommonInfo common = 1;
+  string code = 2;
+  uint32 linkSection = 3; //关联区段
+  repeated uint32 centralizedStations = 4; // 集中站Id列表;
+  uint32 duanNum = 5; //段数
+  uint32 width = 6; // 洗车机宽度
+}
+/** 信标 */
+message Beacon {
+  enum BeaconType {
+    Static = 0;
+    Dynamic = 1;
+  }
+  CommonInfo common = 1;
+  string code = 2;
+  BeaconType type = 3;
+  bool flip = 4;
+}
 
 message Slope {
   CommonInfo common = 1;
   repeated Point points = 2;
   sint32 slopeNumber = 3;          //坡度的值--正负代表上下坡
-  repeated string refDeviceId = 4; // 坡度关联的(坡度公里标)
+  //repeated string oldrefDeviceId = 4; // 坡度关联的(坡度公里标)
+  repeated uint32 refDeviceId = 5; // 坡度关联的(坡度公里标)
 }
 
 message Curvature {
   CommonInfo common = 1;
   repeated Point points = 2;
   sint32 curvatureNumber = 3; //曲线的半径--正代表外侧；负代表内侧
-  repeated string refDeviceId = 4; // 曲线关联的(曲度公里标)
+  //repeated string oldrefDeviceId = 4; // 曲线关联的(曲度公里标)
+  repeated uint32 refDeviceId = 5; // 曲线关联的(曲度公里标)
 }
 
 // 计算link结构
-message CalculateLink {
+// message CalculateLink {
+//   CommonInfo common = 1;
+//   repeated Point points = 2;
+//   int32 length = 3;           //长度，mm
+//   RelatedRef aRelatedRef = 4; // A端（最小端）关联的端点 （道岔端点）
+//   RelatedRef bRelatedRef = 5; // B端（最大端）关联的端点 （道岔端点）
+//   repeated DevicePosition devicePositions = 6; //设备在link上的位置
+//   int32 index = 7;                             // link唯一标识
+//   message DevicePosition {
+//     int32 offset = 1;
+//     string deviceId = 2;
+//     string deviceType = 3;
+//   }
+// }
+/** 发车计时器 */
+message DepartureTimer {
   CommonInfo common = 1;
-  repeated Point points = 2;
-  int32 length = 3;           //长度，mm
-  RelatedRef aRelatedRef = 4; // A端（最小端）关联的端点 （道岔端点）
-  RelatedRef bRelatedRef = 5; // B端（最大端）关联的端点 （道岔端点）
-  repeated DevicePosition devicePositions = 6; //设备在link上的位置
-  int32 index = 7;                             // link唯一标识
-  message DevicePosition {
-    int32 offset = 1;
-    string deviceId = 2;
-    string deviceType = 3;
-  }
+  string code = 2;
+  //string oldrefStand = 3; // 关联站台
+  string runDirection = 4; //运行方向
+  uint32 refStand = 5; // 关联站台
+}
+
+message AutoReturnBox {
+  CommonInfo common = 1;
+  string code = 2;
+  bool flip = 3;      // 是否翻转（前端显示）
+  int32 index = 4;    //索引
+  //string oldrefStand = 5; // 关联站台
+  uint32 refStand = 6; // 关联站台
 }
 
 message UniqueIdOfStationLayout {
   string city = 1;//城市
   string lineId = 2;//线路号
+  string mainCoordinateSystem = 3;//地图的公里标主坐标系
 }
 
 //公里标转换
@@ -478,5 +693,85 @@ message StationRelateDevice {
 }
 message DeviceCombinationtype {
   string code = 1;
-  repeated string refDevices = 2;//车站关联的设备
+  //repeated string oldrefDevices = 2;//车站关联的设备
+  repeated uint32 refDevices = 3;//车站关联的设备
+}
+
+message SectionCodePoint {
+  //string oldCentralizedStation = 1; // 集中站id
+  //repeated string oldsectionIds = 2; //物理区段id列表
+  repeated uint32 sectionIds = 3; //物理区段id列表
+  uint32 centralizedStation = 4; // 集中站id
+}
+
+// 列车信息
+message Train {
+  enum TrainModel { // 车型
+    A = 0;
+    B = 1;
+    C = 2;
+    D = 3;
+  }
+  TrainModel trainModel = 1; // 车型
+  int32 carriageLength = 2; // 列车车厢长度
+  int32 totalLength = 3; // 总长度
+//  int32 minDiameter = 4; // 车轮的最小直径
+//  int32 maxDiameter = 5; // 车轮的最大直径
+  string trainSets = 6; // 编组
+  common.TrainDynamicConfig dynamicConfig = 7; //动力学参数
+//  string trainControlMapCode = 8;
+  int32  trainControlMapId = 9;
+  int32 trainLoad = 10; //列车载荷(吨)
+  float trainMaxSpeed = 11; //列车最大速度(km/h)
+  float trainMaxAcc = 12; //列车最大加速度(m/s^2)
+  float trainMaxBrake = 13; //列车常用最大减速度(m/s^2)
+  float TrainEmergencyBrake = 14; //列车紧急减速度(m/s^2)
+}
+
+// 其他线
+message OtherLine {
+  string name = 1;
+  //repeated string oldids = 2; // 设备id列表
+  repeated uint32 ids = 3; // 设备id列表
+}
+// 设备联锁编号
+message LianSuoIndexData {
+  uint32 id = 1; // 设备id
+  uint32 index = 2; //设备联锁编号
+}
+// 设备联锁映射数据
+message LianSuoData {
+  repeated LianSuoIndexData stations  = 1;
+  repeated LianSuoIndexData switchs = 2;
+  repeated LianSuoIndexData screenDoors = 3;
+  repeated LianSuoIndexData signals = 4;
+  // repeated LianSuoIndexData sections = 5;
+  repeated LianSuoIndexData floodGates = 6;
+  repeated LianSuoIndexData spksSwitchs = 7;
+  repeated LianSuoIndexData garageDoors = 8;
+  repeated LianSuoIndexData carWashing = 9;
+  repeated LianSuoIndexData esbButtons = 10;
+  repeated LianSuoIndexData holdButtons = 11;
+  repeated LianSuoIndexData unattengedButtons = 12;
+  repeated LianSuoIndexData acSections = 13; //计轴区段
+}
+// 无人折返按钮
+message UnattengedButton {
+  CommonInfo common = 1;
+  string code = 2;
+  bool flip = 3;                   // 是否翻转（前端显示）
+  uint32 refStand = 4; // 关联站台
+}
+// 扣车按钮
+message HoldButton {
+  CommonInfo common = 1;
+  string code = 2;
+  bool flip = 3;                   // 是否翻转（前端显示）
+  uint32 refStand = 4; // 关A联站台
+}
+
+// 公里标设计和实际数据
+message KilometerMarkCalibration {
+  KilometerSystem actualKm = 1;
+  KilometerSystem designKm =2;
 }

protos/tccGraphics.proto

@@ -0,0 +1,63 @@
+syntax = "proto3";
+import "stationLayoutGraphics.proto";
+
+package tccGraphicData;
+option go_package = "joylink.club/bj-rtsts-server/dto/data_proto";
+
+message TccGraphicStorage {
+  graphicData.Canvas canvas = 1;
+  repeated TccButton tccButtons = 2;
+  repeated TccText tccTexts = 3;
+  repeated TccKey tccKeys = 4;
+  repeated TccHandle tccHandles = 5;
+  repeated TccLight tccLights = 6;
+}
+
+/** TCC按钮 */
+message TccButton {
+  graphicData.CommonInfo common = 1;
+  string code = 2;
+  bool isSelfReset = 3;
+}
+
+/** TCC文字 */
+message TccText {
+  graphicData.CommonInfo common = 1;
+  string code = 2;
+  string content = 3;
+  string color = 4;
+  int32 fontSize = 5;
+}
+
+/** TCC钥匙 */
+message TccKey {
+  enum TccKeyType {
+    driverControllerActivationClint = 0; //司控器激活端
+    frontAndRearDirectionalControl = 1;//前后方向控制
+    trainDoorMode = 2;//列车门模式
+  }
+  graphicData.CommonInfo common = 1;
+  string code = 2;
+  TccKeyType type = 3;
+}
+
+/** TCC手柄 */
+message TccHandle {
+  graphicData.CommonInfo common = 1;
+  string code = 2;
+}
+
+/** TCC灯 */
+message TccLight {
+  graphicData.CommonInfo common = 1;
+  string code = 2;
+  TccElementColor lightColor = 3;
+  bool activeLevel = 4;//有效电平
+  bool initialState = 5;//初始状态，与有效电平对比，如何相同，刚开始打开驾驶台的时候就是亮着的
+}
+
+enum TccElementColor {
+  green = 0;
+  red = 1;
+  blue = 2;
+}