diff --git a/protos/LineNetTrainOffset.proto b/protos/LineNetTrainOffsetDiagram.proto similarity index 66% rename from protos/LineNetTrainOffset.proto rename to protos/LineNetTrainOffsetDiagram.proto index 9320b64..098d436 100644 --- a/protos/LineNetTrainOffset.proto +++ b/protos/LineNetTrainOffsetDiagram.proto @@ -1,9 +1,10 @@ syntax = "proto3"; -option java_package = "club.joylink.xiannccda.proto.data"; -option java_outer_classname = "LineNetTrainOffsetProto"; +package diagram; +option java_package = "club.joylink.xiannccda.dto.protos"; +option java_outer_classname = "LineNetTrainOffsetDiagramProto"; //线网车辆位置 -message LineNetTrainOffset{ +message LineNetTrainOffsetDiagram{ //线路id int32 lineId = 1; //车组号 diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 30c0226..7c269d5 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -18,6 +18,8 @@ message RtssGraphicStorage { repeated StationLine stationLines = 11; repeated RunLine runLines = 12; repeated TrainLine trainLines = 13; + repeated PathLine pathLines = 14; + repeated Polygon polygons = 15; } message Canvas { @@ -86,6 +88,14 @@ message Rect { Point point = 8; // 画第一个点的坐标 } +message Polygon { + CommonInfo common = 1; + string code = 2; + int32 lineWidth = 3; // 线宽 + string lineColor = 4; // 线色 + repeated Point points = 5; // 点坐标列表 +} + message Platform { CommonInfo common = 1; string code = 2; @@ -96,6 +106,7 @@ message Platform { message Station { CommonInfo common = 1; string code = 2; + bool hasControl = 3; // 是否有控制 } message StationLine { @@ -141,6 +152,8 @@ message RunLine { repeated Point points = 3; string nameColor = 4; string nameBgColor = 5; + string upPathLineId = 6; + string downPathLineId = 7; } message Section { @@ -148,3 +161,9 @@ message Section { string code = 2; repeated Point points = 3; } + +message PathLine { + CommonInfo common = 1; + string code = 2; + repeated Point points = 3; +}