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

protos/device_state.proto

@@ -45,7 +45,11 @@ message  SwitchState{
   //道岔处于反位
   bool  reverse = 3;
 }
-
+//信号机状态
+message SignalState{
+  //信号机索引
+  string  id = 1;
+}
 //列车状态
 message TrainState{
   //列车索引

protos/stationLayoutGraphics.proto

@@ -110,9 +110,9 @@ message Platform {
 message Station {
   CommonInfo common = 1;
   string code = 2;
-  bool hasControl = 3;            // 是否有控制
+  //bool hasControl = 3;            // 是否有控制
   bool concentrationStations = 4; //是否集中站
-                                  // string kilometerCode = 5;       //公里标
+  // string kilometerCode = 5;       //公里标
   KilometerSystem kilometerSystem = 6; //公里标
   int32 index = 7;
 }
@@ -127,7 +127,7 @@ message AxleCounting {
   CommonInfo common = 1;
   string code = 2; // 名称
   KilometerSystem kilometerSystem = 3;     //公里标
-  repeated RelatedRef axleCountingRef = 4; // 计轴关联的物理区段和道岔
+  repeated RelatedRef axleCountingRef = 4; // 计轴关联的非岔区物理区段和道岔，设备id和端口
   int32 index = 5;                   //计轴的索引编号
 }
 
@@ -257,5 +257,5 @@ message LogicSection { // 逻辑区段
   repeated Point points = 3;
   string axleSectionId = 4; // 关联的计轴区段Id
   int32 index = 5;    // 索引编号
-  string turnoutId = 6;  // 关联的岔芯对应的道岔id
+  string turnoutId = 6;  // 关联的岔芯对应的道岔id，此时该逻辑区段为该道岔C端关联的轨道link
 }