diff --git a/protos/ibpGraphics.proto b/protos/ibpGraphics.proto index 486cf5a..ec444f2 100644 --- a/protos/ibpGraphics.proto +++ b/protos/ibpGraphics.proto @@ -13,6 +13,7 @@ message IBPGraphicStorage { // UniqueIdType UniqueIdPrefix = 7; repeated IbpRelatedDevice ibpRelatedDevices = 8; repeated IbpLight ibpLights = 9; + repeated IbpStationText ibpStationTexts = 10; } message IBPButton { @@ -73,3 +74,21 @@ message IbpRelatedDevice { repeated graphicData.DeviceCombinationtype combinationtypes = 2; //组合类型 // graphicData.RelatedRef.DeviceType deviceType = 3; //设备类型 } + +message IbpStationText { + enum IbpStationTextType { + CURRENT = 0; + UP = 1; + DOWN = 2; + } + enum IbpStationTextAlign { + LEFT = 0; + RIGHT = 1; + CENTER = 2; + } + graphicData.CommonInfo common = 1; + IbpStationTextType type = 2; + string color = 4; + int32 fontSize = 5; + IbpStationTextAlign align = 6; +} diff --git a/protos/picture.proto b/protos/picture.proto index b21b4e1..1c8a068 100644 --- a/protos/picture.proto +++ b/protos/picture.proto @@ -11,4 +11,6 @@ enum PictureType { RelayCabinetLayout = 2; /** IBP盘 */ IBP = 3; + /** 列车数据 */ + TrainData = 4; } diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 5e60d1f..1c7fc9a 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -12,7 +12,7 @@ message RtssGraphicStorage { repeated Platform Platforms = 4; repeated Station stations = 5; // repeated Rect rects = 6; - // repeated Train train = 7; + repeated Train train = 7; repeated Signal signals = 8; repeated Turnout turnouts = 9; repeated Section section = 10; @@ -42,8 +42,10 @@ message RtssGraphicStorage { repeated StationRelateDevice stationRelateDeviceList = 34; // 关联设备列表 repeated SectionCodePoint sectionCodePointList = 35; // 物理区段码位表 ScreenDoorConfig screenDoorConfig = 36;//屏蔽门的配置--子屏蔽门的数量和编组列表 - repeated Beacon beacons = 37; + repeated Beacon beacons = 37; // 信标 GenerateAxleCountingConfig generateAxleCountingConfig = 38;//一键生成计轴的配置 + repeated DepartureTimer departureTimers = 39; // 发车计时器 + repeated AutoReturnBox autoReturnBoxs = 40; // 自动折返按钮箱 } message Canvas { @@ -125,7 +127,7 @@ message Platform { string code = 2; //bool hasdoor = 3; // 是否有屏蔽门 //string direction = 4; // 屏蔽门上下 - int32 index = 5; //索引 + // int32 index = 5; //索引 //int32 refStationIndex = 6; //关联车站索引 // repeated string centralizedStations = 7; // 集中站列表 //repeated RelatedRef platformRef = 8; //站台关联的车站和物理区段 @@ -159,9 +161,12 @@ message Station { bool concentrationStations = 4; //是否集中站 // string kilometerCode = 5; //公里标 KilometerSystem kilometerSystem = 6; //公里标 - int32 index = 7; + // int32 index = 7; string refIbpMapCode = 8; // 关联IBP地图Code string stationName = 9; //车站名 + string stationNameAcronym = 10; // 车站名缩写 + bool depots = 11; //是否车辆段 + repeated string manageStations = 12; // 如果是集中站——管理的车站-id } message TrainWindow { @@ -180,7 +185,7 @@ message AxleCounting { KilometerSystem kilometerSystem = 3; //公里标 repeated RelatedRef axleCountingRef = 4; // 计轴关联的非岔区物理区段和道岔,设备id和端口 - int32 index = 5; //计轴的索引编号 + // int32 index = 5; //计轴的索引编号 //bool invent = 6; //是否虚拟计轴--一般是最末端 TypeDetectionPoint type = 7; //检测点的类型:计轴、区段边界 repeated string centralizedStations = 8; // 集中站列表 @@ -219,7 +224,7 @@ message Turnout { //(后端不关注) RelatedRef pcRef = 11; // 道岔C端关联的设备 // KilometerSystem kilometerSystem = 12; // 道岔公里标 repeated KilometerSystem kilometerSystem = 13; // 道岔公里标 - int32 index = 14; //索引 + // int32 index = 14; //索引 string paTrackSectionId = 15; // A端轨道区段id string pbTrackSectionId = 16; // B端轨道区段id string pcTrackSectionId = 17; // C端轨道区段id @@ -246,7 +251,7 @@ message Signal { // int64 kilometer = 4; // string coordinateSystem = 5; KilometerSystem kilometerSystem = 6; - int32 index = 7; //索引 + // int32 index = 7; //索引 RelatedRef refDev = 8; //关联设备(区段/道岔) repeated string centralizedStations = 9; // 集中站列表 // 信号机模型类型枚举 @@ -266,6 +271,7 @@ message Signal { } // 信号机模型类型 Model mt = 10; + string belongStation = 11; // 所属车站(缩写) } /** 物理区段(包含岔区和非岔区) */ @@ -282,7 +288,7 @@ message Section { RelatedRef pbRef = 5; // 区段B端关联的设备(非岔区)(后端不关注) SectionType sectionType = 6; // 区段类型 repeated string axleCountings = 7; // 区段对应的计轴 - int32 index = 8; // 索引 + // int32 index = 8; // 索引 string trackSectionId = 9; // 下属轨道区段id bool isCurve = 10; // 是否曲线 int32 segmentsCount = 12; // 曲线分段数 @@ -332,7 +338,7 @@ message Transponder { // 应答器 CommonInfo common = 1; string code = 2; int32 transponderType = 3; - int32 index = 4; // 索引编号 + // int32 index = 4; // 索引编号 KilometerSystem kilometerSystem = 5; //公里标 RelatedRef TransponderRef = 6; //关联关系 repeated string centralizedStations = 7; // 集中站列表 @@ -361,7 +367,7 @@ message SectionLink { 7; // SectionLink A端连接设备(端口关系 SectionLink/Turnout) RelatedRef bRef = 8; // SectionLink B端连接设备(端口关系 // SectionLink/Turnout) - int32 index = 9; // 索引编号 + // int32 index = 9; // 索引编号 } message AxleCountingSection { // 计轴区段 @@ -371,7 +377,7 @@ message AxleCountingSection { // 计轴区段 RelatedRef paRef = 4; // 计轴区段A端关联的计轴 RelatedRef pbRef = 5; // 计轴区段B端关联的计轴 repeated TurnoutPosRef turnoutPos = 6; //关联道岔的正反位--0是定位,1是反位 - int32 index = 7; //计轴区段的索引编号 + // int32 index = 7; //计轴区段的索引编号 } message LogicSection { // 逻辑区段 @@ -379,7 +385,7 @@ message LogicSection { // 逻辑区段 string code = 2; // 名称 repeated Point points = 3; string axleSectionId = 4; // 关联的计轴区段Id - int32 index = 5; // 索引编号 + // int32 index = 5; // 索引编号 string turnoutId = 6; // 关联的岔芯对应的道岔id,此时该逻辑区段为该道岔C端关联的轨道link } @@ -391,7 +397,7 @@ message TrackSection { //轨道区段 CommonInfo common = 1; repeated Point points = 2; string code = 3; //名称 - int32 index = 4; //索引 + // int32 index = 4; //索引 TrackSectionType type = 5; //类型 string destinationCode = 6; //目的地码 repeated string trackLogicSection = 7; //下属的逻辑区段id(非岔区) @@ -417,7 +423,7 @@ message StopPosition { string code = 2; bool flip = 3; // 是否翻转(前端显示) CoachNum coachNum = 4; //编组数量 - int32 index = 5; //索引 + // int32 index = 5; //索引 KilometerSystem kilometerSystem = 6; RelatedRef refDev = 7; // 关联设备(区段) } @@ -426,7 +432,7 @@ message SpksSwitch { CommonInfo common = 1; string code = 2; bool flip = 3; // 是否翻转(前端显示) - int32 index = 4; //索引 + // int32 index = 4; //索引 // int32 refStand = 5; //关联站台索引 repeated string refSections = 6; // 关联物理区段id string refStand = 7; // 关联站台 @@ -436,7 +442,7 @@ message EsbButton { CommonInfo common = 1; string code = 2; bool flip = 3; // 是否翻转(前端显示) - int32 index = 4; //索引 + // int32 index = 4; //索引 // int32 refStand = 5; // 关联站台索引 string refStand = 6; // 关联站台 } @@ -445,7 +451,7 @@ message GatedBox { CommonInfo common = 1; string code = 2; bool flip = 3; // 是否翻转(前端显示) - int32 index = 4; //索引 + // int32 index = 4; //索引 string refScreenDoor = 5; // 关联屏蔽门 string refGatedBoxMapCode = 6; // 关联门控箱地图Code } @@ -505,6 +511,19 @@ message CalculateLink { string deviceType = 3; } } +/** 发车计时器 */ +message DepartureTimer { + CommonInfo common = 1; + string code = 2; +} + +message AutoReturnBox { + CommonInfo common = 1; + string code = 2; + bool flip = 3; // 是否翻转(前端显示) + int32 index = 4; //索引 + string refStand = 5; // 关联站台 +} message UniqueIdOfStationLayout { string city = 1;//城市 @@ -534,3 +553,19 @@ message SectionCodePoint { string centralizedStation = 1; repeated string sectionIds = 2; //物理区段id列表 } + +// 列车信息 +message Train { + enum TrainModel { // 车型 + A = 0; + B = 1; + C = 2; + D = 3; + } + TrainModel trainModel = 1; // 车型 + int32 carriageLength = 2; // 列车车厢长度 + int32 totalLength = 3; // 总长度 + int32 minDiameter = 4; // 车轮的最小直径 + int32 maxDiameter = 5; // 车轮的最大直径 + string trainSets = 6; // 编组 +}