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

[修改]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/device_state.proto

@@ -1,10 +1,13 @@
 syntax = "proto3";
 import "stationLayoutGraphics.proto";
+import "common_data.proto";
+import "request.proto";
 
 package state;
 option java_package = "club.joylink.bjrtss.ats.verify.protos";
 option java_outer_classname = "DeviceStateProto";
 option go_package = "joylink.club/bj-rtsts-server/dto/state_proto";
+//option go_package = "dto/state_proto;";
 
 
 //状态定义面向物理层即只定义物理状态，不定义逻辑层状态
@@ -28,7 +31,7 @@ message LinkState{
   repeated  string  trainId = 2;
 }
 
-//区段状态
+//物理区段状态
 message SectionState{
   //区段索引
   uint32  id = 1;
@@ -37,6 +40,16 @@ message SectionState{
   bool  occupied = 3;
   //计轴故障
   bool  axleFault = 4;
+  // 计轴复位
+  bool axleDrst = 5;
+  // 计轴预复位
+  bool axlePdrst = 6;
+}
+
+//计轴区段状态
+message AxleCountingSectionState {
+  uint32 id = 1;
+  bool occupied = 2;
 }
 
 //道岔状态
@@ -51,30 +64,22 @@ message  SwitchState{
   bool dw = 4;
   //道岔处于反位（实际）
   bool fw = 5;
-  // 是否强制(屏蔽联锁驱动)
-  bool force = 6;
-  // 是否有失表故障
-  bool sb = 7;
-  // 是否有定位失表故障
-  bool dwsb = 8;
-  // 是否有反位失表故障
-  bool fwsb = 9;
-  // 是否有挤岔故障
-  bool jc = 10;
+  // 道岔设置参数
+  request.PointsParam param = 6;
   // 定操驱动
-  bool qdc = 11;
+  bool qdc = 7;
   // 反操驱动
-  bool qfc = 12;
+  bool qfc = 8;
   // 允许操驱动
-  bool qyc = 13;
-  // 是否定操
-  bool dc = 14;
-  // 是否反操
-  bool fc = 15;
-  // 是否允许操作
-  bool yc = 16;
+  bool qyc = 9;
+  // 定操采集
+  bool dc = 10;
+  // 反操采集
+  bool fc = 11;
+  // 允许操作采集
+  bool yc = 12;
   // 是否占用
-  bool occupied = 17;
+  bool occupied = 13;
 }
 //信号机状态
 message SignalState{
@@ -82,27 +87,29 @@ message SignalState{
   uint32  id = 1;
   //信号机的灯列表
   Signal.Aspect aspect = 2;
+  // 信号机设置参数
+  request.SignalParam param = 3;
+  // 信号机继电器状态
+  map<string, bool> relayStateMap = 4;
 }
 //信号机显示定义
 message Signal {
   //信号机显示枚举
   enum Aspect {
-    //无用值
-    Non = 0;
-    //物理灭灯
-    OFF = 1;
+    //灭灯
+    OFF = 0;
+    //红
+    H = 1;
     //绿灯亮
     L = 2;
-    //红
-    H = 3;
     //黄
-    U = 4;
+    U = 3;
     //红黄
-    HU = 5;
+    HU = 4;
     //白
-    B = 6;
+    B = 5;
     //蓝
-    A = 7;
+    A = 6;
   }
 }
 
@@ -122,6 +129,22 @@ message StationState{
   //车站索引
   uint32  id = 1;
 }
+
+//列车连接状态
+message TrainConnState{
+  bool conn = 1;//连接状态
+  TrainConnType connType = 2;
+  uint32 TrainControlMapId = 3; //关联的列车控制mapId
+  string typeName = 4;//连接名称
+//  map<string, SensorSpeedPulseCount> speedPulseCountMap = 5;//连接状态
+  enum TrainConnType{
+    NONE = 0;//未知连接
+    VOBC = 1; //半实物
+    PC_SIM = 2; //PC仿真
+    /*PC_SIM_A = 3; //PC仿真
+    PC_SIM_B = 4; //PC仿真*/
+  }
+}
 //列车状态
 message TrainState{
   //列车索引
@@ -132,7 +155,7 @@ message TrainState{
   float speed = 3;
   //列车长度,1=1mm
   int64 trainLength = 4;
-  //列车是否显示
+  //列车是否显示（此状态仅在列车被删除时为false，若需更改用途需增加列车被删除状态）
   bool show = 5;
   // 列车车头所在设备ID
   uint32 headDeviceId = 6;
@@ -140,12 +163,12 @@ message TrainState{
   int64 headOffset = 7;
   // 设备端口
   string devicePort = 8;
-  // 运行方向指向(区段：A-B,道岔：-> 岔心)
-  bool pointTo = 9;
-  // 运行上下行（公里标 上行：小 -> 大，下行：大 -> 小）
-  bool runDirection = 10;
-  // 列车车头方向
-  bool headDirection = 11;
+  // 位移方向指向(区段：A-B,道岔：-> 岔心)
+  bool driftTo = 9;
+  // 列车运营上下行（公里标 上行：小 -> 大，下行：大 -> 小）
+  bool trainRunUp = 10;
+  // 列车车头方向 0=未激活，1= 小 -> 大,2=大 -> 小
+  uint32 trainActiveDirection = 11;
   // 动力学信息
   TrainDynamicState dynamicState = 12;
   // 半实物信息
@@ -156,6 +179,67 @@ message TrainState{
   int64 controlDelayTime = 15;
   // 列车轮径
   int32 wheelDiameter = 16;
+  //列车动力学配置
+  common.TrainDynamicConfig trainDynamicConfig = 17;
+  //列车A端
+  common.TrainEndsState trainEndsA = 18;
+  //列车B端
+  common.TrainEndsState trainEndsB = 19;
+  // 列车尾端所在设备ID
+  uint32 tailDeviceId = 20;
+  // 列车尾端所在设备偏移量
+  int64 tailOffset = 21;
+  // 列车尾端所在设备端口
+  string tailDevicePort = 22;
+  // BTM状态 --即将过时 2024-08-12
+//  BTMState btmState = 23;
+  TrainControlState tcc = 24;
+  TrainConnState connState = 25; //列车连接第三方状态
+//  SensorSpeedPulseCount pluseCount = 26;
+//  VobcBtmState vobcBtm = 27;//vobc btm 状态
+  string oldLink = 28;
+  int64 oldLinkOffset = 29;
+  string oldTailLink = 30;
+  int64 oldTailLinkOffset = 31;
+  TrainBtmCache btmBaliseCacheA = 32; //列车应答器缓存
+  TrainBtmCache btmBaliseCacheB = 33; //列车应答器缓存
+
+  int32 TrainLoad = 34; //列车载荷（吨）
+  float TrainMaxSpeed = 35; //列车最大时速
+  float TrainMaxAcc   = 36; //列车最大加速度
+  float TrainMaxBrake  = 37; //列车最大减速度
+  float TrainEmergencyBrake = 38;//列车紧急制动减速度
+  string projectCode = 39;
+//  TrainBtmCache BtmBaliseCache = 40;
+  TrainPort trainPort = 40; //列车当前驾驶的端口
+  map<int32,SensorSpeedPulseCount> pulseCountMap = 41; //列车每端对应的速度 key = TrainPort 枚举的值
+  uint32 trainCoachNum = 42 ;//列车编组信息
+  enum TrainPort{
+    PORT_NONE = 0;
+    PORT_A=1;
+    PORT_B=2;
+
+  }
+//  map<bool,TrainVobcState> trainPortVS  = 40;
+}
+
+//列车应答器缓存
+message TrainBtmCache{
+  uint32 dsn = 1;
+  uint32 baliseCount = 2; //应答器计数（每过一个应答器加一，在同一个应答器内不变)（0~255）
+  uint32 messageCounter = 3; //报文计数器 (每解出一个报文加一)（0~255）
+  string resendBaliseId = 4;
+  repeated BTMState baliseList = 5;
+}
+
+
+//速度传感器脉冲数
+message SensorSpeedPulseCount{
+    uint32 pulseCount1 = 1;
+//    uint32 pulseCount2 = 2;
+    repeated float pulseCount3 = 3;
+//    repeated float pulseCount4 = 4;
+
 }
 
 // 动力学列车状态
@@ -179,35 +263,39 @@ message TrainDynamicState {
   bool upslope = 8;
   //列车当前运行方向,1 =上行true 0 =下行false
   bool runningUp = 9;
-  //实际运行阻力（总）（N）totalResistance,1=1KN
+  //实际运行阻力（总）（N）totalResistance,1=1N
   float runningResistanceSum = 10;
-  //阻力1（空气阻力）（N）airResistance,1=1KN
+  //阻力1（空气阻力）（N）airResistance,1=1N
   float airResistance = 11;
-  //阻力2（坡道阻力）（N）slopeResistance,1=1KN
+  //阻力2（坡道阻力）（N）slopeResistance,1=1N
   float rampResistance = 12;
-  //阻力3（曲线阻力）（N）curveResistance,1=1KN
+  //阻力3（曲线阻力）（N）curveResistance,1=1N
   float curveResistance = 13;
-  //列车运行速度（m/s）speed,1=1km/h
+  //列车运行速度（m/s）speed,1=1m/s 此处放置的是转换后的数据km/h
   int32 speed = 14;
-  //头车速传1速度值（m/s）headSpeed1,1=1km/h
+  //头车速传1速度值（m/s）headSpeed1,1=1m/s 此处放置的是转换后的数据km/h
   int32 headSensorSpeed1 = 15;
-  //头车速度2速度值（m/s）headSpeed2,1=1km/h
+  //头车速度2速度值（m/s）headSpeed2,1=1m/s 此处放置的是转换后的数据km/h
   int32 headSensorSpeed2 = 16;
-  //尾车速传1速度值（m/s）tailSpeed1,1=1km/h
+  //尾车速传1速度值（m/s）tailSpeed1,1=1m/s 此处放置的是转换后的数据km/h
   int32 tailSensorSpeed1 = 17;
-  //尾车速度2速度值（m/s）tailSpeed2,1=1km/h
+  //尾车速度2速度值（m/s）tailSpeed2,1=1m/s 此处放置的是转换后的数据km/h
   int32 tailSensorSpeed2 = 18;
-  //头车雷达速度值（m/s）headRadarSpeed,1=1km/h
+  //头车雷达速度值（m/s）headRadarSpeed,1=1m/s 此处放置的是转换后的数据km/h
   int32 headRadarSpeed = 19;
-  //尾车雷达速度值（m/s）tailRadarSpeed,1=1km/h
+  //尾车雷达速度值（m/s）tailRadarSpeed,1=1m/s 此处放置的是转换后的数据km/h
   int32 tailRadarSpeed = 20;
   // 通讯中断
   bool udpInterruption = 21;
   // 加速
   float acceleration = 22;
+  //列车位移
+//  int32 Displacement = 23;
+  float Displacement = 23;
+
 }
 
-// vobc发过来的列车信息
+// vobc发过来的列车信息 包括 (驾驶台和车载)
 message TrainVobcState {
   // 生命信号	每个周期+1
   int32 lifeSignal = 1;
@@ -261,6 +349,144 @@ message TrainVobcState {
   bool udpInterruption = 25;
   // 更新时间
   int64 updateTime = 26;
+  //强制门允许
+  bool forceDoorAllow = 27;
+//    模式降级按钮
+  bool modeLevelDownBtn = 28;
+//    确认按钮
+  bool confirmBtn = 29;
+//    模式升级按钮
+  bool modeLevelUpBtn = 30;
+//    ATO发车按钮
+  bool atoSendTrainBtn = 31;
+//  列车完整性
+//  bool trainIntegrity = 32;
+//    车载ATP/ATO旁路状态
+    bool atpOrAtoBypassState = 33;
+//    车辆牵引已切除状态
+    bool trainTractionCuted = 34;
+//    障碍物检测按钮
+    bool obstacleCheckBtn = 35;
+//    驾驶室激活反馈
+//    bool driverActiveReportBtn = 36;
+//    制动重故障按钮
+    bool brakeHeavyFault = 37;
+//    左门状态
+    bool leftDoorState = 38;
+//    右门状态
+  bool rightDoorState = 39;
+//  唤醒按钮
+  bool wakeUpBtn = 40;
+//  检修按钮
+  bool overhaulBtn = 41;
+//  欠压按钮
+  bool undervoltageBtn = 42;
+//  休眠按钮
+  bool  sleepBtn = 43;
+//  紧急手柄拉下
+  bool   emergentHandleDown = 44;
+//  车门锁闭状态
+  bool  doorLockState =45;
+//  逃生门状态
+  bool  lifeDoorState=46;
+//  车辆低压上电状态
+  bool trainLowPowerResetState=47;
+//  ATP上电按钮
+  bool atpPowerOnBtn=48;
+// AA自动开关门
+  bool doorModeAA=49;
+//AM自开人关
+  bool doorModeAM=50;
+  // MM人开人关
+  bool doorModeMM=51;
+  //    外部紧急制动反馈
+//  bool outerEmergentBrakeReport = 52;
+  //    车门外指示灯
+  bool trainDoorOutLed = 53;
+
+  //本端ATP控车
+  bool localAtpControl = 54;
+  //ATO制动命令输出
+  bool atoBrakeCommand = 55;
+//    ATO牵引命令输出
+  bool atoTractionCommandOut = 56;
+  //ATO惰行命令输出
+  bool atoLazyCommandOut = 57;
+////    AR灯命令
+//  bool arLightCommand = 58;
+  //ATO保持制动
+  bool atoAlwaysBrake=59;
+  //ATO开左门
+  bool  atoOpenLeftDoor=60;
+  //ATO开右门
+  bool atoOpenRightDoor=61;
+  //ATO关左门
+  bool atoCloseLeftDoor=62;
+//    零速信号
+  bool noSpeedSigle = 63;
+//    列车启动指示灯
+  bool trainStartedLed = 64;
+//    常用制动
+  bool mostUseBrake = 65;
+//    过分相输出
+  bool splittingOut = 66;
+//  模式继电器
+  bool modeRelay = 67;
+//      牵引有效
+  bool tractionEffective=68;
+//  制动有效
+  bool brakeEffective=69;
+//      制动隔离
+  bool brakeQuarantine=70;
+//  停放制动缓解
+  bool stopNotAllBrake=71;
+//    ATO牵引指令1
+  bool atoTractionCommand1 = 72;
+//    ATO牵引指令2
+      bool atoTractionCommand2=73;
+//    ATO牵引指令3
+    bool atoTractionCommand3=74;
+    uint32 mockInfo = 75; //车载接口输出的模拟量信息
+//  atp 切除开关
+  bool atpCutSwitch = 76;
+  //紧急制动指示灯
+    bool lightEmergencyBrakingStatus = 77;
+    //切牵引指示灯
+    bool lightTractionSafetyCircuit = 78;
+    //车头方向指示灯1
+    bool lightDir1 = 79;
+    //车头方向指示灯2
+    bool lightDir2 = 80;
+    //驾驶室激活
+    bool lightDriverActive = 81;
+  //列车连接半实物是否初始化
+    bool trainConnInitComplate = 82;
+    //ato关右门
+    bool atoCloseRightDoor = 83;
+    bool lightAtoSend = 84;
+    //Ato运行级位
+    AtoStepLevel atoStepLevel = 85;
+    VobcBtmInfo vobcBtmInfo = 86;
+//  int64 lineInitTimeStamp12 = 87; //12号线列出初始化时间戳
+//  bool line12ConnErr = 88;//12号线连接错误，因为12号线atp故障（此时atp需要重启）时，还是会发送数据通过此次属性标记atp状态情况(多次观察atp故障时，atp输出数字量返回的数据最后一个直接是0)
+//  bool trainConnInitComplateTc1 = 87;
+//  bool trainConnInitComplateTc2 = 88;
+
+  message VobcBtmInfo{
+    uint32 btmId = 1;
+    uint32 vobcId = 2;
+    uint32 vobcLifeId = 3;
+  }
+    enum AtoStepLevel{
+      ATO_STEP_LEVEL_NONE=0;
+      ATO_STEP_LEVEL_1 = 1;
+      ATO_STEP_LEVEL_2 = 2;
+      ATO_STEP_LEVEL_3 = 3;
+      ATO_STEP_LEVEL_4 = 4;
+      ATO_STEP_LEVEL_5 = 5;
+      ATO_STEP_LEVEL_6 = 6;
+      ATO_STEP_LEVEL_7 = 7;
+    }
 }
 
 // 发给前端的列车状态
@@ -282,11 +508,15 @@ message TrainMapState{
   // 设备端口
   string devicePort = 8;
   // 运行方向指向(区段：A-B,道岔：-> 岔心)
-  bool pointTo = 9;
+//  bool pointTo = 9;
+  bool driftTo = 9;
   // 运行上下行（公里标 上行：小 -> 大，下行：大 -> 小）
-  bool runDirection = 10;
+//  bool runDirection = 10;
+  bool trainRunUp = 10;
   // 列车车头方向
-  bool headDirection = 11;
+//  bool headDirection = 11;
+  // 列车车头方向 0= 均为激活；1=向小，2=向大
+  uint32 trainActiveDirection = 11;
   // 所在公里标
   int64 trainKilometer = 12;
   // 控制响应延时
@@ -390,8 +620,103 @@ message TrainMapState{
   bool allDoorClose = 60;
   // 通讯中断
   bool vobcInterruption = 61;
+  //列车动力学配置
+  TrainDynamicConfigMqtt trainDynamicConfig = 62;
+  //列车A端
+  TrainEndsStateMqtt trainEndsA = 63;
+  //列车B端
+  TrainEndsStateMqtt trainEndsB = 64;
+  //列车位移
+//  int32 Displacement = 65;
+  float Displacement = 65;
+  // 列车车尾所在设备ID
+  uint32 tailDeviceId = 66;
+  // 列车车尾所在设备偏移量
+  int64 tailOffset = 67;
+  // 列车车尾所在设备端口
+  string tailDevicePort = 68;
+  // BTM状态
+//  BTMState btmState = 69;
+  TrainConnState connState = 69; //列车连接第三方状态
 }
 
+message BTMState {
+  string telegram = 1;//应答器用户报文（16进制字符串）
+  bool aboveBalise  = 2;  //BTM天线即将经过应答器
+  string baliseTelegramForPcSimResend = 3; //列车pc仿真暂存应答器回复数据
+  string telegram128 = 4 ;//应答器报文128（16进制字符串）
+  string baliseId = 5;
+  bool isSend = 6;//记录是否发送过
+  bool unpack =7; //解包是否成功
+  int32 baliseType = 8; //应答器类型 与model的类型一致
+  bool hasData =9; //是否有应答器报文
+  uint32 resendCount = 10;//重发次数
+  uint32 packageDataSN = 11;//11号线需要验证报文序列号
+}
+
+//动力学相关参数返回数据，因golang float类型数据序列化后丢失精度故使用string
+//此类型需要与 common_data 中的 TrainDynamicConfig类型属性保持一致
+message TrainDynamicConfigMqtt{
+
+  //基本阻力参数A 原本数据：float
+  string davisParamA = 1;
+  //  基本阻力参数B 原本数据：float
+  string davisParamB = 2;
+  //  基本阻力参数C 原本数据：float
+  string davisParamC = 3;
+  //曲线阻力参数R1 原本数据：float
+  string curveResistanceParamR1 = 4;
+  //  曲线阻力参数R2 原本数据：float
+  string curveResistanceParamR2 = 5;
+  //  曲线阻力参数R3 原本数据：float
+  string curveResistanceParamR3 = 6;
+  //  曲线阻力参数R4 原本数据：float
+  string curveResistanceParamR4 = 7;
+  //旋转质量参数 原本数据：float
+  string revolvingMassParam = 8;
+  //是否跳跃
+  bool jump = 9;
+  //打滑加速度(m/s) 默认0 原本属性 float
+  string slipA = 10;
+  //    打滑冲击率(m/s) 默认0
+  string slipR = 11;
+  // 打滑持续时间ms 默认0
+  int32 slipD = 12;
+  // 空转加速度（m/s2），默认值：0 原本属性 float
+  string idlingA = 14;
+  // 空转冲击率（m/s3），默认值：0
+  string idlingR = 15;
+  //    空转持续时间（ms），默认值：0
+  int32 idlingD = 16;
+  //过标/欠标（mm）（正数过标，负数欠标）
+  int32 stopSign = 17;
+  //    前溜/后溜（m/s）（正数前溜，负数后溜），默认值：0  原本属性 float
+  string slide = 18 ;
+  //列车载荷
+//  int32 trainLoad = 19;
+}
+//列车一端的状态
+message TrainEndsStateMqtt{
+  //速度传感器
+  bool speedSensorEnableA = 1;
+  bool speedSensorEnableB = 2;
+  //雷达是否有效
+  bool radarEnable = 3;
+  //雷达测速差值（千米/小时） 原本数据：float
+  string radarCheckSpeedDiff = 4;
+  //雷达检测时间(秒)
+  int32 radarCheckTime = 5;
+  bool accEnable = 6;
+  //加速度测速差值（米/秒）
+  string accCheckSpeedDiff = 7;
+  //加速度持续时间
+  int32 accCheckTime = 8;
+  // 速传速度输出（千米/小时）
+  int32 accOutSpeed = 9;
+  // 雷达速度输出（千米/小时）
+  int32 radarOutSpeed = 10;
+
+}
 // 继电器状态
 message ReplyState {
   // 继电器索引
@@ -400,6 +725,8 @@ message ReplyState {
   bool xh = 2;
   // 继电器编号
   string code = 3;
+  // 是否强制
+  bool force = 4;
 }
 
 // 按钮状态
@@ -407,6 +734,7 @@ message ButtonState {
   uint32 id = 1;
   bool down = 2;
   bool active = 3; // 带灯的按钮
+  //  bool bypass = 4; //摁钮，钥匙 是否旁路
 }
 
 // 警铃状态
@@ -426,6 +754,8 @@ message PsdState {
   uint32 id = 1; //屏蔽门的id
   repeated AsdState asdStates = 2; //滑动门状态
   bool mgj = 3; //屏蔽门整体的关闭（继电器）状态
+  request.PsdParam param = 4; //屏蔽门设置的参数
+  bool zaw = 5;  //有障碍物
 }
 
 //滑动门状态
@@ -434,12 +764,16 @@ message AsdState {
   bool kmdw = 2; //开门到位（实际位置）
   bool gmdw = 3; //关门到位（实际位置）
   bool mgj = 4; //门关继电器
+  bool zaw = 5; //有障碍物
+  bool force = 6; //强制开/关门
 }
 
+
 // 钥匙状态
 message KeyState {
   uint32 id = 1;
   int32 gear = 2;
+  //  bool bypass = 3; //摁钮，钥匙 是否旁路
 }
 
 // 战场图门控箱继电器状态
@@ -452,7 +786,46 @@ message MkxJState {
 message BaliseState {
   uint32 id = 1;
   graphicData.KilometerSystem km = 2; //当前公里标
-  string telegram = 3; //当前报文（16进制字符串）
+  string fixedTelegram = 3; //固定报文
+  string fixedUserTelegram = 4; //固定用户报文
+  string variableTelegram = 5; //可变报文
+  string variableUserTelegram = 6; //可变用户报文
+  bool work = 7; //是否正常工作
+}
+
+// 车站联锁驱采状态
+message StationQc {
+  repeated State qdStates = 1; //驱动状态
+  repeated State cjStates = 2; //采集状态
+
+  message State {
+    int32 row = 1; //行
+    int32 col = 2; //列
+    bool on = 3; //接通
+  }
+}
+
+// 车库门
+message CkmState {
+  uint32 id = 1; //车库门的id
+  bool mgj = 2; //车库门关闭继电器
+  request.CkmParam param = 3; //车库门设置的参数
+  bool local = 4; //本地/远程（门模式继电器）
+  bool mplj = 5; //门旁路继电器
+}
+
+// 洗车机
+message XcjState {
+  uint32 id = 1; //车库门的id
+  request.XcjParam param = 2; //洗车机设置的参数
+  bool xqj = 3; //洗车请求
+  repeated bool twjList = 4; //停稳
+  bool tgqj = 5; //通过请求
+  bool xcjxj = 6; //洗车就绪
+  bool xcyxj = 7; //洗车允许
+  repeated bool cfjList = 8; //移动允许
+  bool jtj = 9; //紧急停车
+  bool tgyxj = 10; //通过允许
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -477,7 +850,7 @@ message AllDevicesStatus{
   repeated TrainMapState trainState = 1;
   // 所有道岔状态
   repeated SwitchState switchState = 2;
-  // 所有类型区段状态
+  // 物理区段状态
   repeated SectionState sectionState = 3;
   // 所有继电器状态
   repeated ReplyState replyState = 4;
@@ -497,6 +870,16 @@ message AllDevicesStatus{
   repeated PlatformState platformState = 11;
   // 应答器状态
   repeated BaliseState baliseState = 12;
+  // 车站联锁驱采状态
+  StationQc stationQc = 13;
+  // 车库门状态
+  repeated CkmState ckmStates = 14;
+  // 防淹门状态
+  repeated CkmState fymStates = 15;
+  // 洗车机状态
+  repeated XcjState xcjStates = 16;
+  // 计轴区段状态
+  repeated AxleCountingSectionState axleCountingSection = 17;
 }
 
 //服务器端向前端推送的设备状态信息
@@ -514,15 +897,108 @@ message PushedDevicesStatus{
 message SimulationStatus {
 
   enum SimulationState {
-    PAUSE = 0;
-    START = 1;
-    ERROR = 2;
-    DESTROY = 3;
+    Init = 0;
+    Running = 1;
+    Pause = 2;
+    Error = 3;
+    Destroy = 4;
   }
 
   string simulationId = 1;
-
   SimulationState state = 2;
+  // string description = 3;
+}
+
+// 仿真在用的第三方接口状态列表
+message SimulationThirdPartyApiService {
+  enum Type {
+    // 未定义
+    Undefined = 0;
+    // 与动力学接口服务
+    Dynamics = 1;
+    // 与半实物列车接口服务
+    SemiPhysicalTrain = 2;
+    //列车pc仿真
+    Train_pc_sim = 3;
+    // 联锁通信服务
+    CI = 4;
+    // 计轴区段通信服务
+    AxleSection = 5;
+  }
+  // 服务状态
+  enum State {
+    // 服务正常
+    Normal = 0;
+    // 服务异常
+    Error = 1;
+  }
+
+  // 服务列表
+  repeated SimulationThirdPartyApiServiceState states = 1;
+}
+
+// 仿真第三方接口状态
+message SimulationThirdPartyApiServiceState {
+  // 接口服务类型
+  SimulationThirdPartyApiService.Type type = 1;
+  // 服务状态
+  SimulationThirdPartyApiService.State state = 2;
+  // 服务描述
+  string serviceName = 3;
+}
+
+//列车控制状态
+message TrainControlState{
+
+  map<string,ControlButton> buttons = 1;
+  repeated DriverKeySwitch driverKey = 2; //驾驶端激活
+  map<string,SwitchKeyChange> switchKeyMap = 3;
+
+//  DirectionKeySwitch dirKey = 3; //接车运行方向
+  PushHandler pushHandler = 4; //牵引制动手柄
+  map<string, ControlLight> lightMaps = 5;
+//  int64 lineInitTimeStamp12PortA = 6; //12号线列出初始化时间戳
+//  int64 lineInitTimeStamp12PortB = 7; //12号线列出初始化时间戳
+//  bool line12ConnErrPortA = 8;//12号线连接错误，因为12号线atp故障（此时atp需要重启）时，还是会发送数据通过此次属性标记atp状态情况(多次观察atp故障时，atp输出数字量返回的数据最后一个直接是0)
+//  bool line12ConnErrPortB = 9;//12号线连接错误，因为12号线atp故障（此时atp需要重启）时，还是会发送数据通过此次属性标记atp状态情况(多次观察atp故障时，atp输出数字量返回的数据最后一个直接是0)
+//  bool TrainConnInitComplatePortA = 10;
+//  bool TrainConnInitComplatePortB = 11;
+//  bool activeTrainA = 12;
+//  bool activeTrainB = 13;
+//  bool Line12ConnErr = 14;
+//  int64 lineInitTimeStamp12 = 15;
+  message ControlButton{
+    uint32 id = 1;
+    bool passed = 3;
+  }
+
+  message DriverKeySwitch{
+    uint32 id = 1;
+    bool val = 2;  //0=关，1=开
+//    request.DriverType dt = 3;
+
+  }
+  message  SwitchKeyChange{
+    uint32 id = 1;
+    uint32 val = 2;  //0=后(mm)，1=前(AA),2=中位(AM)
+  }
+  //牵引制动手柄
+  message PushHandler{
+    uint32 id = 1;
+    int32 val = 2; // 牵引或制动 大于0是牵引，小于0是制动 整体按照整型传输(*100)，使用时除以100
+  }
+  message ControlLight{
+    uint32 id = 1;
+    bool val = 2;
+  }
+}
+//返回前端列车控制状态
+message TrainControlStateMsg{
+  repeated TrainControlState.ControlButton buttons = 1;
+  repeated TrainControlState.DriverKeySwitch driverKey = 2; //驾驶端激活
+  repeated TrainControlState.SwitchKeyChange switchKeys = 3; //接车运行方向
+  TrainControlState.PushHandler pushHandler = 4; //牵引制动手柄
+  repeated TrainControlState.ControlLight lights = 5;
+}
+
 
-  string description = 3;
-}

protos/picture.proto

@@ -13,4 +13,6 @@ enum PictureType {
   IBP = 3;
   /** 列车数据 */
   TrainData = 4;
+  /** 列车驾驶台 */
+  TrainControlCab = 5;
 }

protos/relayCabinetLayoutGraphics.proto

@@ -39,6 +39,8 @@ message Relay {
   string code = 2;//编号
   //string model = 3;//型号
   ModelType newModel = 4;//型号
+  string showCode = 5;//展示的编号
+  CjDataItem.PostionType defaultInitialPosition = 6;//默认初始位置
 }
 
 /* 断相保护器 */
@@ -64,7 +66,7 @@ message DeviceRelateRelay {
 }
 message Combinationtype {
   string code = 1;
-  repeated string oldrefRelays = 2;//设备关联的继电器
+  //repeated string oldrefRelays = 2;//设备关联的继电器
   repeated uint32 refRelays = 3;//设备关联的继电器
 }
 
@@ -93,8 +95,9 @@ message CjDataItem {
   enum PostionType {
       Q=0;
       H=1;
+      NONE=2;
   }
-  string oldrelayId = 1;//采集对应的继电器Id
+  //string oldrelayId = 1;//采集对应的继电器Id
   PostionType position = 2;//继电器的位置，QH对应着吸合
   uint32 relayId = 3;//采集对应的继电器Id
 }
@@ -111,6 +114,6 @@ message QdDataSet {
 }
 
 message QdData {
-  repeated string oldrefRelays=1;//驱动的继电器Id
+  //repeated string oldrefRelays=1;//驱动的继电器Id
   repeated uint32 refRelays=2;//驱动的继电器Id
 }

protos/request.proto

@@ -2,6 +2,28 @@ syntax = "proto3";
 
 package request;
 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 {
@@ -23,30 +45,33 @@ message RelayOperationReq {
 }
 
 // 道岔
-message Turnout {
+message Points {
   // 道岔操作
   enum Operation {
     Undefined = 0; // 未定义
-    DC = 1;        // 定操
-    CancelDC = 2;  // 取消定操
-    FC = 3;        // 反操
-    CancelFC = 4;  // 取消反操
-    SetSB = 5;     // 设置失表故障
-    CancelSB = 6;  // 取消失表故障
-    SetJC = 7;     // 设置挤岔故障
-    CancelJC = 8;  // 取消挤岔故障
-    ForceDw = 9; // 强制定位
-    ForceFw = 10; // 强制反位
-    CancelForce = 11; // 取消强制
+    SetParams = 1; // 设置参数
+  }
+  // 道岔强制
+  enum Force {
+    FP_NONE = 0; // 无强制
+    FP_DW = 1;   // 定位
+    FP_FW = 2;   // 反位
+    FP_SB = 3;  // 失表
   }
 }
 
 // 道岔操作请求
-message TurnoutOperationReq {
+message PointsOperationReq {
   string simulationId = 1;         // 仿真id
   int32 mapId = 2;                 // 图id
   uint32 deviceId = 3;             // 设备id
-  Turnout.Operation operation = 4; // 道岔操作
+  Points.Operation operation = 4; // 道岔操作
+  PointsParam param = 5; // 道岔参数,当operation为SetParams时有效
+}
+
+// 道岔参数
+message PointsParam {
+  Points.Force forcePosition = 1; // 道岔强制
 }
 
 // 信号机
@@ -54,64 +79,95 @@ 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; //取消白灯断丝故障
+    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
+  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 {
-    SetDrst = 0;//设置计轴直接复位
-    CancelDrst = 1;//取消计轴直接复位
-    SetPdrst = 2;//设置计轴预复位
-    CancelPdrst = 3;//取消计轴预复位
+    Undefined = 0; // 未定义
+    SetParams = 1; // 设置参数
+    // SetDrst = 0;//设置计轴直接复位
+    // CancelDrst = 1;//取消计轴直接复位
+    // SetPdrst = 2;//设置计轴预复位
+    // CancelPdrst = 3;//取消计轴预复位
     SetFaultOcc = 4;    //设置故障占用
-    CancelFaultOcc = 5; //取消故障占用
+    // 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;
-    //屏蔽门控制
-//    Km4 = 1; //四编组开门
-//    CancelKm4 = 2; //取消四编组开门
-//    Km8 = 3; //八编组开门
-//    CancelKm8 = 4; //取消八编组开门
-//    Gm = 5; //关门
-//    CancelGm = 6; //取消关门
-//    ForceKm4 = 7; //强制四编组开门
-//    ForceKm8 = 8; //强制八编组开门
-//    ForceGm = 9; //强制关门
-    Km = 1; //开门
-    CancelKm = 2; //取消开门
-    Gm = 3; //关门
-    CancelGm = 4; //取消关门
-    ForceKm = 5; //强制开门
-    ForceGm = 6; //强制关门
-    CancelForce = 10; //取消强制
-    //屏蔽门故障
-    AsdCannotOpen = 11; //滑动门无法开门
-    CancelAsdCannotOpen = 12; //取消滑动门无法开门
-    AsdCannotClose = 13; //滑动门无法关闭
-    CancelAsdCannotClose = 14; //取消滑动门无法关闭
-    //间隙探测
-    QDTC = 15; //启动探测
-    CancelQDTC = 16; //取消启动探测
-    TZTC = 17; //停止探测
-    CancelTZTC = 18; //取消停止探测
+    SetParams = 1; // 设置参数
+  }
+  enum Force {
+    F_NONE = 0; //无强制
+    F_ASD_KM = 1; //滑动门强制开门
+    F_ASD_GM = 2; //滑动门强制关门
+  }
+  enum Fault {
+    FA_NONE = 0; //无故障
+    FA_Obstacle = 1; //设置故障物
   }
 }
 
@@ -121,6 +177,114 @@ message PsdOperationReq {
   int32 mapId = 2;                 // 图id
   uint32 deviceId = 3;             // 设备id
   Psd.Operation operation = 4; // 操作
-  repeated int32 asdCodes = 5; //无法关闭/无法开启故障涉及的滑动门的编号
-  int32 group = 6; //开门操作的编组
+  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,6 +1,8 @@
 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 = "joylink.club/bj-rtsts-server/dto/data_proto";
@@ -25,7 +27,7 @@ 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;                            // 坡度
@@ -36,7 +38,7 @@ message RtssGraphicStorage {
   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; // 关联设备列表
@@ -48,6 +50,16 @@ message RtssGraphicStorage {
   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 {
@@ -59,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 {
@@ -89,7 +110,7 @@ message ChildTransform {
 }
 // 公共属性
 message CommonInfo {
-  string oldid = 1;
+//  string oldid = 1;
   string graphicType = 2;
   Transform transform = 3;
   repeated ChildTransform childTransforms = 4;
@@ -131,8 +152,8 @@ message ConcentrationDividingLine {
   CommonInfo common = 1;
   string code = 2;           // 编号
   repeated Point points = 3; // 点列表
-  string oldrefLeftStationId = 4;//左边关联的集中站id
-  string oldrefRightStationId = 5;//右边关联的集中站id
+  //string oldrefLeftStationId = 4;//左边关联的集中站id
+  //string oldrefRightStationId = 5;//右边关联的集中站id
   repeated NodeConWithSec nodeConWithSecs = 6;// 集中区分割线与区段的交点
   bool isOtherLineConcentrationDividingLine = 7;//集中区分割线绘制在其它线的边界处
   uint32 refLeftStationId = 8;//左边关联的集中站id
@@ -158,8 +179,8 @@ message Platform {
   //int32 refStationIndex = 6; //关联车站索引
   // repeated string centralizedStations = 7; // 集中站列表
   //repeated RelatedRef platformRef = 8; //站台关联的车站和物理区段
-  string oldrefStationId = 9; //关联的车站的id
-  string oldrefSectionId = 10; //关联的物理区段id
+  //string oldrefStationId = 9; //关联的车站的id
+  //string oldrefSectionId = 10; //关联的物理区段id
   string refEsbRelayCode = 11;//关联的紧急停车继电器的编号
   TypeOfPlatform type = 12; //站台的上下行
   uint32 refStationId = 13; //关联的车站的id
@@ -170,7 +191,7 @@ message ScreenDoor {
   CommonInfo common = 1;
   string code = 2;
   //int32 sonDoorAmount = 3; //子屏蔽门的数量
-  string oldrefPlatformId = 4; //关联的站台
+  //string oldrefPlatformId = 4; //关联的站台
   //repeated ScreenDoorGroup screenDoorGroupList = 5;//编组列表
   uint32 refPlatformId = 6; //关联的站台
 }
@@ -194,11 +215,11 @@ message Station {
   // string kilometerCode = 5;       //公里标
   KilometerSystem kilometerSystem = 6; //公里标
   // int32 index = 7;
-  string refIbpMapCode = 8; // 关联IBP地图Code
+  //string refIbpMapCode = 8; // 关联IBP地图Code
   string stationName = 9; //车站名
   string stationNameAcronym = 10; //  车站名拼音简写
   bool depots = 11; //是否车辆段
-  repeated string oldmanageStations = 12; // 如果是集中站——管理的车站-id
+  //repeated string oldmanageStations = 12; // 如果是集中站——管理的车站-id
   repeated uint32 manageStations = 13; // 如果是集中站——管理的车站-id
 }
 
@@ -220,13 +241,13 @@ message AxleCounting {
   // int32 index = 5;             //计轴的索引编号
   //bool invent = 6;             //是否虚拟计轴--一般是最末端
   TypeDetectionPoint type = 7; //检测点的类型：计轴、区段边界
-  repeated string oldcentralizedStations = 8; // 集中站Id列表
+  //repeated string oldcentralizedStations = 8; // 集中站Id列表
   repeated uint32 centralizedStations = 9; // 集中站Id列表
 }
 
 message GenerateAxleCountingConfig {
-  repeated string oldbbConnect = 1; //需要在道岔bb连接处生成计轴的道岔id(填一个就行)
-  repeated string oldnoGenerateGroup = 2;//指定的道岔组不生成计轴
+  //repeated string oldbbConnect = 1; //需要在道岔bb连接处生成计轴的道岔id(填一个就行)
+  //repeated string oldnoGenerateGroup = 2;//指定的道岔组不生成计轴
   repeated uint32 bbConnect = 3; //需要在道岔bb连接处生成计轴的道岔id(填一个就行)
   repeated uint32 noGenerateGroup = 4;//指定的道岔组不生成计轴
 }
@@ -260,11 +281,11 @@ message Turnout { //(后端不关注)
   // KilometerSystem kilometerSystem = 12; // 道岔公里标
   repeated KilometerSystem kilometerSystem = 13; // 道岔公里标
   // int32 index = 14;                              //索引
-  string oldpaTrackSectionId = 15;                  // A端轨道区段id
-  string oldpbTrackSectionId = 16;                  // B端轨道区段id
-  string oldpcTrackSectionId = 17;                  // C端轨道区段id
+  //string oldpaTrackSectionId = 15;                  // A端轨道区段id
+  //string oldpbTrackSectionId = 16;                  // B端轨道区段id
+  //string oldpcTrackSectionId = 17;                  // C端轨道区段id
   SwitchMachineType switchMachineType = 18;      // 转辙机类型
-  repeated string oldcentralizedStations = 19; // 集中站Id列表
+  //repeated string oldcentralizedStations = 19; // 集中站Id列表
   repeated uint32 centralizedStations = 20; // 集中站Id列表
   uint32 paTrackSectionId = 21;                  // A端轨道区段id
   uint32 pbTrackSectionId = 22;                  // B端轨道区段id
@@ -292,7 +313,7 @@ message Signal {
   KilometerSystem kilometerSystem = 6;
   // int32 index = 7;       //索引
   RelatedRef refDev = 8; //关联设备（区段/道岔）
-  repeated string oldcentralizedStations = 9; // 集中站Id列表
+  //repeated string oldcentralizedStations = 9; // 集中站Id列表
   // 信号机模型类型枚举
   // 从左向右，最左边为靠近灯座的灯
   // 如果没有说明，默认不封灯，无引导
@@ -341,12 +362,12 @@ message Section {
   RelatedRef paRef = 4; // 区段A端关联的设备(非岔区)(后端不关注)
   RelatedRef pbRef = 5; // 区段B端关联的设备(非岔区)(后端不关注)
   SectionType sectionType = 6;       // 区段类型
-  repeated string oldaxleCountings = 7; // 区段对应的计轴
+  //repeated string oldaxleCountings = 7; // 区段对应的计轴
   // int32 index = 8;                   // 索引
-  string oldtrackSectionId = 9;         // 下属轨道区段id
+  //string oldtrackSectionId = 9;         // 下属轨道区段id
   bool isCurve = 10;                 // 是否曲线
   int32 segmentsCount = 12;          // 曲线分段数
-  repeated string oldcentralizedStations = 13; // 集中站Id列表
+  //repeated string oldcentralizedStations = 13; // 集中站Id列表
   RunningDirection normalRunningDirection = 14; //常规运行方向
   bool isTurnBackZone = 15; // 是否为折返区域
   Direction direction = 16; // 上下行
@@ -358,10 +379,10 @@ message Section {
 //关联设备
 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;
@@ -369,6 +390,11 @@ message RelatedRef {
     SignalFaultAlarm = 8;
     Breakers = 9;//断路器
     PowerScreen = 10;//电源屏
+    GarageDoor = 11; //车库门
+    CarWashing = 12; //洗车机
+    FloodGate = 13; //防淹门
+    Platform = 14; //站台
+    LS = 15;//
   }
 
   enum DevicePort {
@@ -378,14 +404,14 @@ message RelatedRef {
   }
 
   DeviceType deviceType = 1; //关联的设备类型
-  string oldid = 2;             //关联的设备ID
+  //string oldid = 2;             //关联的设备ID
   DevicePort devicePort = 3; //关联的设备端口
   uint32 id = 4;
 }
 
 //计轴区段与道岔的位置关系
 message TurnoutPosRef {
-  string oldid = 1;      //道岔的ID
+  //string oldid = 1;      //道岔的ID
   int32 position = 2; //道岔的正反为，0是定位，1是反位
   uint32 id = 3;
 }
@@ -410,10 +436,15 @@ message Transponder { // 应答器
   // int32 index = 4;                     // 索引编号
   KilometerSystem kilometerSystem = 5; //公里标
   RelatedRef TransponderRef = 6;       //关联关系
-  repeated string oldcentralizedStations = 7; // 集中站Id列表
-  bytes fixedTelegram = 8;//无源应答器固定报文
+  //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 {
@@ -422,7 +453,7 @@ message SimpleRef {
     AxleCounting = 1;
   }
   DeviceType deviceType = 1;
-  string oldid = 2;
+  //string oldid = 2;
   uint32 id = 3;
 }
 
@@ -456,9 +487,9 @@ message LogicSection { // 逻辑区段
   CommonInfo common = 1;
   string code = 2; // 名称
   repeated Point points = 3;
-  string oldaxleSectionId = 4; // 关联的计轴区段Id
+  //string oldaxleSectionId = 4; // 关联的计轴区段Id
   // int32 index = 5;          // 索引编号
-  string oldturnoutId = 6; // 关联的岔芯对应的道岔id，此时该逻辑区段为该道岔C端关联的轨道link
+  //string oldturnoutId = 6; // 关联的岔芯对应的道岔id，此时该逻辑区段为该道岔C端关联的轨道link
   uint32 axleSectionId = 7; // 关联的计轴区段Id
   uint32 turnoutId = 8; // 关联的岔芯对应的道岔id，此时该逻辑区段为该道岔C端关联的轨道link
 }
@@ -474,7 +505,7 @@ message TrackSection { //轨道区段
   // int32 index = 4;                       //索引
   TrackSectionType type = 5;             //类型
   string destinationCode = 6;            //目的地码
-  repeated string oldtrackLogicSection = 7; //下属的逻辑区段id(非岔区)
+  //repeated string oldtrackLogicSection = 7; //下属的逻辑区段id(非岔区)
   //   //关联的物理设备id(物理区段/道岔)由另一端(物理区段/道岔处理)
   bool isCurve = 8;        // 是否曲线
   int32 segmentsCount = 9; // 曲线分段数
@@ -509,9 +540,9 @@ message SpksSwitch {
   bool flip = 3;                   // 是否翻转（前端显示）
   // int32 index = 4;                 //索引
   // int32 refStand = 5;              //关联站台索引
-  repeated string oldrefSections = 6; // 关联物理区段id
-  string oldrefStand = 7; // 关联站台
-  repeated uint32 refSections = 8; // 关联物理区段id
+  //repeated string oldrefSections = 6; // 关联物理区段id
+  //string oldrefStand = 7; // 关联站台
+  // repeated uint32 refSections = 8; // 关联物理区段id
   uint32 refStand = 9; // 关联站台
 }
 
@@ -521,8 +552,9 @@ message EsbButton {
   bool flip = 3;      // 是否翻转（前端显示）
   // int32 index = 4;    //索引
   // int32 refStand = 5; // 关联站台索引
-  string oldrefStand = 6; // 关联站台
+  //string oldrefStand = 6; // 关联站台
   uint32 refStand = 7; // 关联站台
+  //string refEsbButtonMapCode = 8; // 关联紧急关闭按钮地图Code--关联PSL地图
 }
 
 message GatedBox {
@@ -530,11 +562,25 @@ message GatedBox {
   string code = 2;
   bool flip = 3;   // 是否翻转（前端显示）
   // int32 index = 4; //索引
-  string oldrefScreenDoor = 5; // 关联屏蔽门
+  //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
+}
+
 /** 坡度公里标 */
 message SlopeKiloMarker {
   CommonInfo common = 1;
@@ -548,7 +594,23 @@ 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 {
@@ -565,7 +627,7 @@ message Slope {
   CommonInfo common = 1;
   repeated Point points = 2;
   sint32 slopeNumber = 3;          //坡度的值--正负代表上下坡
-  repeated string oldrefDeviceId = 4; // 坡度关联的(坡度公里标)
+  //repeated string oldrefDeviceId = 4; // 坡度关联的(坡度公里标)
   repeated uint32 refDeviceId = 5; // 坡度关联的(坡度公里标)
 }
 
@@ -573,7 +635,7 @@ message Curvature {
   CommonInfo common = 1;
   repeated Point points = 2;
   sint32 curvatureNumber = 3; //曲线的半径--正代表外侧；负代表内侧
-  repeated string oldrefDeviceId = 4; // 曲线关联的(曲度公里标)
+  //repeated string oldrefDeviceId = 4; // 曲线关联的(曲度公里标)
   repeated uint32 refDeviceId = 5; // 曲线关联的(曲度公里标)
 }
 
@@ -596,7 +658,7 @@ message Curvature {
 message DepartureTimer {
   CommonInfo common = 1;
   string code = 2;
-  string oldrefStand = 3; // 关联站台
+  //string oldrefStand = 3; // 关联站台
   string runDirection = 4; //运行方向
   uint32 refStand = 5; // 关联站台
 }
@@ -606,7 +668,7 @@ message AutoReturnBox {
   string code = 2;
   bool flip = 3;      // 是否翻转（前端显示）
   int32 index = 4;    //索引
-  string oldrefStand = 5; // 关联站台
+  //string oldrefStand = 5; // 关联站台
   uint32 refStand = 6; // 关联站台
 }
 
@@ -631,13 +693,13 @@ message StationRelateDevice {
 }
 message DeviceCombinationtype {
   string code = 1;
-  repeated string oldrefDevices = 2;//车站关联的设备
+  //repeated string oldrefDevices = 2;//车站关联的设备
   repeated uint32 refDevices = 3;//车站关联的设备
 }
 
 message SectionCodePoint {
-  string oldCentralizedStation = 1; // 集中站id
-  repeated string oldsectionIds = 2; //物理区段id列表
+  //string oldCentralizedStation = 1; // 集中站id
+  //repeated string oldsectionIds = 2; //物理区段id列表
   repeated uint32 sectionIds = 3; //物理区段id列表
   uint32 centralizedStation = 4; // 集中站id
 }
@@ -653,14 +715,63 @@ message Train {
   TrainModel trainModel = 1; // 车型
   int32 carriageLength = 2; // 列车车厢长度
   int32 totalLength = 3; // 总长度
-  int32 minDiameter = 4; // 车轮的最小直径
-  int32 maxDiameter = 5; // 车轮的最大直径
+//  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 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;
+}