Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-message into HEAD

protos/device_state.proto

@@ -71,6 +71,8 @@ message  SwitchState{
 	bool fc = 15;
 	// 是否允许操作
 	bool yc = 16;
+	// 是否占用
+	bool occupied = 17;
 }
 //信号机状态
 message SignalState{
@@ -111,7 +113,7 @@ message PlatformState{
 	// SPKS继电器状态
 	repeated ReplyState spksState = 3;
 	// 门控箱继电器状态
-	repeated MkxJState mkxJState = 4;
+	MkxJState mkxJState = 4;
 }
 //车站状态
 message StationState{
@@ -150,8 +152,8 @@ message TrainState{
 	int64 trainKilometer = 14;
 	// 控制响应延时
 	int64 controlDelayTime = 15;
-	// 列车车头所在设备UID
-	string headDeviceUId = 16;
+	// 列车轮径
+	int32 wheelDiameter = 16;
 }
 
 // 动力学列车状态

protos/relayCabinetLayoutGraphics.proto

@@ -12,7 +12,7 @@ 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;//驱动列表

protos/request.proto

@@ -66,6 +66,7 @@ message Section {
 message Psd {
   enum Operation {
     Undefined = 0;
+    //屏蔽门控制
     Km4 = 1; //四编组开门
     CancelKm4 = 2; //取消四编组开门
     Km8 = 3; //八编组开门
@@ -76,11 +77,16 @@ message Psd {
     ForceKm8 = 8; //强制八编组开门
     ForceGm = 9; //强制关门
     CancelForce = 10; //取消强制
-
+    //屏蔽门故障
     AsdCannotOpen = 11; //滑动门无法开门
     CancelAsdCannotOpen = 12; //取消滑动门无法开门
     AsdCannotClose = 13; //滑动门无法关闭
     CancelAsdCannotClose = 14; //取消滑动门无法关闭
+    //间隙探测
+    QDTC = 15; //启动探测
+    CancelQDTC = 16; //取消启动探测
+    TZTC = 17; //停止探测
+    CancelTZTC = 18; //取消停止探测
   }
 }
 

protos/stationLayoutGraphics.proto

@@ -41,6 +41,9 @@ message RtssGraphicStorage {
   repeated ScreenDoor screenDoors = 33;
   repeated StationRelateDevice stationRelateDeviceList = 34; // 关联设备列表
   repeated SectionCodePoint sectionCodePointList = 35; // 物理区段码位表
+  ScreenDoorConfig screenDoorConfig = 36;//屏蔽门的配置--子屏蔽门的数量和编组列表
+  repeated Beacon beacons = 37;
+  GenerateAxleCountingConfig generateAxleCountingConfig = 38;//一键生成计轴的配置
 }
 
 message Canvas {
@@ -133,9 +136,14 @@ message Platform {
 message ScreenDoor {
   CommonInfo common = 1;
   string code = 2;
-  int32 sonDoorAmount = 3; //子屏蔽门的数量
+  //int32 sonDoorAmount = 3; //子屏蔽门的数量
   string refPlatformId = 4; //关联的站台
-  repeated ScreenDoorGroup screenDoorGroupList = 5;//编组列表
+  //repeated ScreenDoorGroup screenDoorGroupList = 5;//编组列表
+}
+
+message ScreenDoorConfig {
+  int32 sonDoorAmount = 1; //子屏蔽门的数量
+  repeated ScreenDoorGroup screenDoorGroupList = 2;//编组列表
 }
 
 message ScreenDoorGroup {
@@ -178,6 +186,11 @@ message AxleCounting {
   repeated string centralizedStations = 8; // 集中站列表
 }
 
+message GenerateAxleCountingConfig {
+  repeated string bbConnect = 1; //需要在道岔bb连接处生成计轴的道岔id(填一个就行)
+  repeated string noGenerateGroup = 2;//指定的道岔组不生成计轴
+}
+
 // message Train {
 //   CommonInfo common = 1;
 //   string code = 2;
@@ -288,6 +301,8 @@ message RelatedRef {
     station = 6;
     ScreenDoor = 7;
     SignalFaultAlarm = 8;
+    Breakers = 9;//断路器
+    PowerScreen = 10;//电源屏
   }
 
   enum DevicePort {
@@ -448,6 +463,18 @@ message CurvatureKiloMarker {
   repeated KilometerSystem kilometerSystem = 4; //公里标数据
 }
 
+/** 信标 */
+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;