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 7fc3295..6ed021b 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -17,7 +17,7 @@ message RtssGraphicStorage { repeated Section section = 10; repeated StationLine stationLines = 11; repeated RunLine runLines = 12; - + repeated TrainLine trainLines = 13; } message Canvas { @@ -111,6 +111,11 @@ message Train { bool hasBorder = 4; // 是否有边框 } +message TrainLine { + CommonInfo common = 1; + string code = 2; +} + message IscsFan { CommonInfo common = 1; string code = 2;