proto文件调整

protos/ibpGraphics.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 import "stationLayoutGraphics.proto";
-
+import "relayCabinetLayoutGraphics.proto";
 package ibpGraphicData;
 
 message IBPGraphicStorage {
@@ -10,7 +10,7 @@ message IBPGraphicStorage {
   repeated IbpKey ibpKeys = 4;
   repeated IbpArrow ibpArrows = 5;
   repeated IBPText IBPTexts = 6;
-  UniqueIdType UniqueIdPrefix = 7;
+  relayCabinetGraphicData.UniqueIdType UniqueIdPrefix = 7;
 }
 
 message IBPButton {
@@ -47,21 +47,15 @@ message IbpKey {
   string code = 2;
 }
 
-message Point {
-  // x坐标
-  float x = 1;
-  // y坐标
-  float y = 2;
-}
 
 message IbpArrow {
   graphicData.CommonInfo common = 1;
   string code = 2;
-  repeated Point points = 3;
+  repeated graphicData.Point points = 3;
 }
 
-message UniqueIdType {
-  string city = 1;           //城市
-  string lineId = 2;         //线路号
-  string belongsStation = 3; //所属车站
-}
+// message UniqueIdType {
+//   string city = 1;           //城市
+//   string lineId = 2;         //线路号
+//   string belongsStation = 3; //所属车站
+// }

protos/pslGraphics.proto

@@ -55,10 +55,10 @@ message PslText {
 /* 门控箱关联的设备列表 */
 message GatedRelateDevice {
   string code = 1;//设备编号
-  repeated Combinationtype combinationtypes = 2; //组合类型
+  repeated GatedCombinationtype combinationtypes = 2; //组合类型
   graphicData.RelatedRef.DeviceType deviceType = 3;//设备类型
 }
-message Combinationtype {
+message GatedCombinationtype {
   string code = 1;
   repeated string refDevices = 2;//门控箱关联的设备
 }

protos/stationLayoutGraphics.proto

@@ -149,6 +149,7 @@ message Station {
   // string kilometerCode = 5;       //公里标
   KilometerSystem kilometerSystem = 6; //公里标
   int32 index = 7;
+  string refIbpMapCode = 8; // 关联IBP地图Code
 }
 
 message TrainWindow {
@@ -408,6 +409,7 @@ message GatedBox {
   bool flip = 3;   // 是否翻转（前端显示）
   int32 index = 4; //索引
   string refScreenDoor = 5; // 关联屏蔽门
+  string refGatedBoxMapCode = 6; // 关联门控箱地图Code
 }
 
 /** 坡度公里标 */