Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-message

protos/device_info.proto

@@ -0,0 +1,41 @@
+syntax = "proto3";
+
+package state;
+import "stationLayoutGraphics.proto";
+option java_package = "club.joylink.xiannccda.dto.protos";
+option java_outer_classname = "DeviceInfoProto";
+
+// 区段
+message Section {
+  string id = 1;
+
+  // 区段编码
+  string code = 2;
+
+  // 区段类型
+  graphicData.Section.SectionType type = 3;
+
+  // a端公里标
+  string paKilometerCode = 4;
+
+  // b端公里标
+  string pbKilometerCode = 5;
+
+  // 关联区段
+  repeated Section children = 6;
+}
+
+// 道岔
+message Switch {
+
+  string id = 1;
+
+  string code = 2;
+
+  Section paSection = 3;
+
+  Section pbSection = 4;
+
+  Section pcSection = 5;
+}
+

protos/section_status.proto

@@ -1,29 +0,0 @@
-syntax = "proto3";
-
-package state;
-option java_package = "club.joylink.xiannccda.dto.protos";
-option java_outer_classname = "SectionProto";
-
-message Section {
-  // 区段编码
-  string code = 1;
-
-  // 左侧区段
-  Section leftSection = 2;
-
-  // 右侧区段
-  Section rightSection = 3;
-
-  // 是否计轴区段
-  bool axleCounter = 4;
-
-  // 关联区段
-  repeated Section logicList = 5;
-
-  // 左侧公里标
-  string leftKilometerCode = 6;
-
-  // 右侧公里标
-  string rightKilometerCode = 7;
-}
-

protos/stationLayoutGraphics.proto

@@ -168,11 +168,19 @@ message RunLine {
 }
 
 message Section {
+  enum SectionType {
+    Physical = 0;
+    Logic = 1;
+    TurnoutPhysical = 2;
+  }
+
   CommonInfo common = 1;
   string code = 2;
   repeated Point points = 3;
-  RelatedRef paRef = 4; // 区段A端关联的设备
+  RelatedRef paRef = 4;        // 区段A端关联的设备
-  RelatedRef pbRef = 5; // 区段B端关联的设备
+  RelatedRef pbRef = 5;        // 区段B端关联的设备
+  SectionType sectionType = 6; // 区段类型
+  repeated string children = 7; // 物理区段的下属逻辑区段/道岔物理区段的下属道岔
 }
 
 message KilometerPoint {