From a5229b090fd21a5f72cd437ccb9623257724cbed Mon Sep 17 00:00:00 2001 From: joylink_zhangsai <1021828630@qq.com> Date: Fri, 30 Jun 2023 17:54:27 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=AD=A6?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/alertInfo.proto | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 protos/alertInfo.proto diff --git a/protos/alertInfo.proto b/protos/alertInfo.proto new file mode 100644 index 0000000..cdce959 --- /dev/null +++ b/protos/alertInfo.proto @@ -0,0 +1,28 @@ +syntax = "proto3"; + +package state; + +import "google/protobuf/timestamp.proto"; +import "google/protobuf/wrappers.proto"; + +//模型的可变的状态数据 +//import "LineNetTrainOffsetDiagram.proto"; +option java_package = "club.joylink.xiannccda.dto.protos"; +option java_outer_classname = "NccAlertInfoMessageProto"; + +message NccAlertInfoMessage { + message Message { + string id = 1; + + string level = 2; + + google.protobuf.Timestamp alert_time = 3; + + string info = 4; + + google.protobuf.Int32Value alert_tip_id = 5; + } + repeated Message messages = 1; + + +} From 539fdc0abfb2e9ab7e4bc26c3111666d0b762ff3 Mon Sep 17 00:00:00 2001 From: Yuan Date: Thu, 13 Jul 2023 10:35:24 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E9=81=93=E5=B2=94=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_status.proto | 100 ++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 52 deletions(-) diff --git a/protos/device_status.proto b/protos/device_status.proto index fd29d73..c498fd8 100644 --- a/protos/device_status.proto +++ b/protos/device_status.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package state; //模型的可变的状态数据 option java_package = "club.joylink.xiannccda.dto.protos"; option java_outer_classname = "DeviceStatusProto"; -enum DeviceType{ +enum DeviceType { UNKNOW = 0; RTU = 1; STATION = 2; @@ -16,10 +16,9 @@ enum DeviceType{ WATERPROOF_DOOR = 9; WORK_AREA = 10; GAMA = 11; - } -message Rtu{ +message Rtu { bool ipRtuStusDown = 1; bool ipRtuStusInLocalCtrl = 2; bool ipRtuStusInCentralCtrl = 3; @@ -28,7 +27,7 @@ message Rtu{ string id = 5; } -message Station{ +message Station { bool ipStaStusTermMode1 = 1; bool ipStaStusTermMode2 = 2; bool ipStaStusTermMode3 = 3; @@ -57,7 +56,7 @@ message Station{ string id = 25; } -message Signal{ +message Signal { bool redOpen = 1; bool redFlash = 2; bool greenOpen = 3; @@ -85,7 +84,7 @@ message Signal{ string id = 24; } -message Entry{ +message Entry { bool dirLeft = 1; bool dirRight = 2; bool dirLocked = 3; @@ -93,41 +92,41 @@ message Entry{ string id = 4; } -message Switch{ - bool ipSingleSwitchStusCiOccupied = 1; - bool ipSingleSwitchStusCbtcOccupied = 2; - bool ipSingleSwitchStusLocked = 3; - bool ipSingleSwitchStusFailLocked = 4; - bool ipSingleSwitchStusNormal = 5; - bool ipSingleSwitchStusReverse = 6; - bool ipSingleSwitchStusBlocked1 = 7; - bool ipSingleSwitchStusJammed = 8; - bool ipSingleSwitchStusExpectLock = 9; - bool ipSingleSwitchStusExpectUnlock = 10; - bool ipSingleSwitchStusExpectNormal = 11; - bool ipSingleSwitchStusExpectReverse = 12; - bool ipSingleSwitchStusExpectBlock = 13; - bool ipSingleSwitchStusExpectUnblock = 14; - bool ipSingleSwitchStusInRoute = 15; - bool ipSingleSwitchStusManualMode = 16; - bool ipSingleSwitchStusCut = 17; - bool ipSingleSwitchStusAtcInvalid = 18; - bool ipSingleSwitchStusOverlap = 19; - bool ipSingleSwitchStusTsrCbtcMain = 20; - bool ipSingleSwitchStusTsrCbtcNormal = 21; - bool ipSingleSwitchStusTsrCbtcReverse = 22; - bool ipSingleSwitchStusTsrBmMain = 23; - bool ipSingleSwitchStusTsrBmNormal = 24; - bool ipSingleSwitchStusTsrBmReverse = 25; - bool ipSingleSwitchStusBlocked2 = 26; - bool ipSingleSwitchStusLostIndication = 27; +message Switch { + bool ipSingleSwitchStusCiOccupied = 1; // 连锁报告道岔占用 + bool ipSingleSwitchStusCbtcOccupied = 2; // CBTC报告道岔占用 + bool ipSingleSwitchStusLocked = 3; // 道岔锁闭 + bool ipSingleSwitchStusFailLocked = 4; // 道岔故障锁闭 + bool ipSingleSwitchStusNormal = 5; // 定位 + bool ipSingleSwitchStusReverse = 6; // 反位 + bool ipSingleSwitchStusBlocked1 = 7; // 单锁 + bool ipSingleSwitchStusJammed = 8; // 挤岔 + bool ipSingleSwitchStusExpectLock = 9; // 期望锁闭 + bool ipSingleSwitchStusExpectUnlock = 10; // 期望锁闭解除 + bool ipSingleSwitchStusExpectNormal = 11; // 期望道岔定位 + bool ipSingleSwitchStusExpectReverse = 12; // 期望道岔反位 + bool ipSingleSwitchStusExpectBlock = 13; // 期望道岔单锁 + bool ipSingleSwitchStusExpectUnblock = 14; // 期望道岔解除单锁 + bool ipSingleSwitchStusInRoute = 15; // 是否在进路中锁闭 + bool ipSingleSwitchStusManualMode = 16; // 道岔为手动操作模式 + bool ipSingleSwitchStusCut = 17; // 道岔切除 + bool ipSingleSwitchStusAtcInvalid = 18; // 道岔区段被ATC报告失效 + bool ipSingleSwitchStusOverlap = 19; // OVERLAP + bool ipSingleSwitchStusTsrCbtcMain = 20; // CBTC岔前限速 + bool ipSingleSwitchStusTsrCbtcNormal = 21; // CBTC定位限速 + bool ipSingleSwitchStusTsrCbtcReverse = 22; // CBTC反位限速 + bool ipSingleSwitchStusTsrBmMain = 23; // BM岔前限速 + bool ipSingleSwitchStusTsrBmNormal = 24; // BM定位限速 + bool ipSingleSwitchStusTsrBmReverse = 25; // BM反位限速 + bool ipSingleSwitchStusBlocked2 = 26; // 道岔封锁 + bool ipSingleSwitchStusLostIndication = 27; // 道岔失表示 //设备唯一识别码，一般为设备名称 string id = 28; //限速值KM/H int32 speedLimit = 29; } -message Track{ +message Track { bool ciOccupied = 1; bool cbtcOccupied = 2; bool locked = 3; @@ -146,8 +145,8 @@ message Track{ //限速类型 LimitType limitType = 14; - //track限速类型 - enum LimitType{ + // track限速类型 + enum LimitType { Unknown = 0; //为1时，CBTC限速 Cbtc = 1; @@ -158,7 +157,7 @@ message Track{ } } -message Platform{ +message Platform { bool emergstop = 1; bool trainberth = 2; bool close = 3; @@ -182,7 +181,7 @@ message Platform{ int32 stopTime = 17; } -message Scada{ +message Scada { bool scadaOn = 1; bool scadaSinglePower = 2; bool scadaUnkown = 3; @@ -190,7 +189,7 @@ message Scada{ string id = 4; } -message WaterProofDoor{ +message WaterProofDoor { bool doorClosed = 1; bool doorExpectClose = 2; bool doorAgreeClosed = 3; @@ -200,19 +199,19 @@ message WaterProofDoor{ string id = 6; } -message WorkArea{ +message WorkArea { bool ipStusWorkAreaEnable = 1; //设备唯一识别码，一般为设备名称 string id = 2; } -message Gama{ +message Gama { bool ipStusGamaDisable = 1; //设备唯一识别码，一般为设备名称 string id = 2; } -message TrainMode{ +message TrainMode { bool ipModeTrainTypeManual = 1; bool ipModeTrainTypeHead = 2; bool ipModeTrainTypeSpecial = 3; @@ -253,15 +252,12 @@ message TrainMode{ ////////////////////////////////////////////////////////////////////// -//2.7.2 信息源网络状态消息 -//NCC FEP与OCC FEP 间的网络连接状态 -message OccNccFepNetwork{ +// 2.7.2 信息源网络状态消息 +// NCC FEP与OCC FEP 间的网络连接状态 +message OccNccFepNetwork { //当前线路号 string id = 1; - //true 代表与当前线路号的信息源(server)连接正常 - //false 代表断开 - bool active = 2; + // true 代表与当前线路号的信息源(server)连接正常 + // false 代表断开 + bool active = 2; } - - - From 0bfe31c66d3c803ade150caceccc514008985a72 Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 13 Jul 2023 15:32:43 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A8=E8=BF=B9?= =?UTF-8?q?=E7=BA=BF=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 1ffbb38..94a31c5 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -218,6 +218,7 @@ message PathLine { repeated Point points = 3; bool isUp = 4; repeated KilometerPoint kilometerPoints = 5; + bool aToB = 6; } //关联设备 From a097dac7f76c1bc1ca5728caeeee2b8c123bae05 Mon Sep 17 00:00:00 2001 From: Yuan Date: Thu, 13 Jul 2023 17:59:18 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E5=8C=BA=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_status.proto | 16 ++++++++-------- protos/stationLayoutGraphics.proto | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/protos/device_status.proto b/protos/device_status.proto index 99d71a9..5e9a78b 100644 --- a/protos/device_status.proto +++ b/protos/device_status.proto @@ -101,14 +101,14 @@ message Switch { bool ipSingleSwitchStusReverse = 6; // 反位 bool ipSingleSwitchStusBlocked1 = 7; // 单锁 bool ipSingleSwitchStusJammed = 8; // 挤岔 - bool ipSingleSwitchStusExpectLock = 9; // 期望锁闭 - bool ipSingleSwitchStusExpectUnlock = 10; // 期望锁闭解除 - bool ipSingleSwitchStusExpectNormal = 11; // 期望道岔定位 - bool ipSingleSwitchStusExpectReverse = 12; // 期望道岔反位 - bool ipSingleSwitchStusExpectBlock = 13; // 期望道岔单锁 - bool ipSingleSwitchStusExpectUnblock = 14; // 期望道岔解除单锁 - bool ipSingleSwitchStusInRoute = 15; // 是否在进路中锁闭 - bool ipSingleSwitchStusManualMode = 16; // 道岔为手动操作模式 + // bool ipSingleSwitchStusExpectLock = 9; // 期望锁闭 + // bool ipSingleSwitchStusExpectUnlock = 10; // 期望锁闭解除 + // bool ipSingleSwitchStusExpectNormal = 11; // 期望道岔定位 + // bool ipSingleSwitchStusExpectReverse = 12; // 期望道岔反位 + // bool ipSingleSwitchStusExpectBlock = 13; // 期望道岔单锁 + // bool ipSingleSwitchStusExpectUnblock = 14; // 期望道岔解除单锁 + // bool ipSingleSwitchStusInRoute = 15; // 是否在进路中锁闭 + // bool ipSingleSwitchStusManualMode = 16; // 道岔为手动操作模式 bool ipSingleSwitchStusCut = 17; // 道岔切除 bool ipSingleSwitchStusAtcInvalid = 18; // 道岔区段被ATC报告失效 bool ipSingleSwitchStusOverlap = 19; // OVERLAP diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 1ffbb38..220cf01 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -200,10 +200,10 @@ message Section { CommonInfo common = 1; string code = 2; repeated Point points = 3; - RelatedRef paRef = 4; // 区段A端关联的设备 - RelatedRef pbRef = 5; // 区段B端关联的设备 - SectionType sectionType = 6; // 区段类型 - repeated string children = 7; // 物理区段的下属逻辑区段/道岔物理区段的下属道岔 + RelatedRef paRef = 4; // 区段A端关联的设备(非岔区) + RelatedRef pbRef = 5; // 区段B端关联的设备(非岔区) + SectionType sectionType = 6; // 区段类型 + repeated string axleCountings = 7; // 关联的计轴 } message KilometerPoint { From 6c2387311aa3c744e380e772df9cba6a49ace989 Mon Sep 17 00:00:00 2001 From: joylink_zhangsai <1021828630@qq.com> Date: Fri, 14 Jul 2023 15:23:54 +0800 Subject: [PATCH 05/13] =?UTF-8?q?alertInfo.proto=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/alertInfo.proto | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/protos/alertInfo.proto b/protos/alertInfo.proto index cdce959..48ec940 100644 --- a/protos/alertInfo.proto +++ b/protos/alertInfo.proto @@ -2,8 +2,6 @@ syntax = "proto3"; package state; -import "google/protobuf/timestamp.proto"; -import "google/protobuf/wrappers.proto"; //模型的可变的状态数据 //import "LineNetTrainOffsetDiagram.proto"; @@ -16,11 +14,11 @@ message NccAlertInfoMessage { string level = 2; - google.protobuf.Timestamp alert_time = 3; + string alert_time = 3; string info = 4; - google.protobuf.Int32Value alert_tip_id = 5; + int32 alert_tip_id = 5; } repeated Message messages = 1; From 874a6fe4fafcda375e7479e7da0d67d1061ab2f1 Mon Sep 17 00:00:00 2001 From: joylink_zhangsai <1021828630@qq.com> Date: Fri, 14 Jul 2023 17:42:53 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90proto?= =?UTF-8?q?->java=EF=BC=9B=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=AD=A6=E5=86=B3?= =?UTF-8?q?=E7=AD=96=E4=BF=A1=E6=81=AFCURD=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/alertInfo.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/alertInfo.proto b/protos/alertInfo.proto index 48ec940..4cc9424 100644 --- a/protos/alertInfo.proto +++ b/protos/alertInfo.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package state; +package alert; //模型的可变的状态数据 From b37c99bc1764a2c3a41ef5a20969642384374a5f Mon Sep 17 00:00:00 2001 From: fan Date: Mon, 17 Jul 2023 13:47:47 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E6=94=B9=E4=BF=AEpathLine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 3db3dc1..5732679 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -216,9 +216,9 @@ message PathLine { CommonInfo common = 1; string code = 2; repeated Point points = 3; - bool isUp = 4; - repeated KilometerPoint kilometerPoints = 5; - bool aToB = 6; + bool isUp = 4; // 是否上行 + repeated KilometerPoint kilometerPoints = 5; // 车站对应的公里标以及坐标点 + bool isKmIncrease = 6; // 运行方向是否公里标递增 } //关联设备 From 2b1cf46a4bece01bce4b3269e4fcf094f8117492 Mon Sep 17 00:00:00 2001 From: joylink_zhangsai <1021828630@qq.com> Date: Mon, 17 Jul 2023 16:00:28 +0800 Subject: [PATCH 08/13] =?UTF-8?q?AlertInfo=E5=A2=9E=E5=8A=A0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E4=BF=A1=E6=81=AF=E5=92=8C=E6=95=85=E9=9A=9C=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/alertInfo.proto | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/protos/alertInfo.proto b/protos/alertInfo.proto index 4cc9424..6c6c332 100644 --- a/protos/alertInfo.proto +++ b/protos/alertInfo.proto @@ -19,6 +19,12 @@ message NccAlertInfoMessage { string info = 4; int32 alert_tip_id = 5; + + //故障设备信息 + string device_info = 6; + + //导致报警的原因 + string reason = 7; } repeated Message messages = 1; From 05d0643e31367d75ed7117489d889e68eb77c385 Mon Sep 17 00:00:00 2001 From: Yuan Date: Mon, 17 Jul 2023 16:12:51 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8C=BA=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 3db3dc1..8e279dd 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -190,20 +190,28 @@ message RunLine { string lineId = 10; } +/** 物理区段 */ message Section { enum SectionType { - Physical = 0; - Logic = 1; - TurnoutPhysical = 2; + Physical = 0; //物理区段 + TurnoutPhysical = 2; //道岔物理区段 } CommonInfo common = 1; string code = 2; repeated Point points = 3; - RelatedRef paRef = 4; // 区段A端关联的设备(非岔区) - RelatedRef pbRef = 5; // 区段B端关联的设备(非岔区) + RelatedRef paRef = 4; // 区段A端关联的物理区段或道岔(非岔区) + RelatedRef pbRef = 5; // 区段B端关联的物理区段或道岔(非岔区) SectionType sectionType = 6; // 区段类型 - repeated string axleCountings = 7; // 关联的计轴 + repeated string axleCountings = 7; // 关联的计轴(岔区&&非岔区) + repeated string children = 8; // 下属逻辑区段id(非岔区) +} + +/** 逻辑区段 */ +message LogicSection { + CommonInfo common = 1; + string code = 2; + repeated Point points = 3; } message KilometerPoint { From f86b35768560ddd4e2a3bef70c9b8dfe42510d8f Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Mon, 17 Jul 2023 17:30:32 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=97=E8=BD=A6?= =?UTF-8?q?=E7=9B=AE=E7=9A=84=E5=9C=B0=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/train.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/train.proto b/protos/train.proto index 202e2a9..2b35cda 100644 --- a/protos/train.proto +++ b/protos/train.proto @@ -25,7 +25,7 @@ message TrainInfo { // 列车车次号 string globalId = 9; // 目的地ID - int32 destinationId = 10; + string destinationId = 10; // 编组数量 int32 rollingStock = 11; // 司机号 From 1f8152527ec070b69c0ed7a0c88ced7ecba097b0 Mon Sep 17 00:00:00 2001 From: Yuan Date: Tue, 18 Jul 2023 10:35:58 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8C=BA=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index d20921b..f7e9086 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -23,6 +23,7 @@ message RtssGraphicStorage { repeated TrainWindow trainWindows = 16; repeated AxleCounting axleCountings = 17; repeated Separator separators = 18; + repeated LogicSection logicSections = 19; } message Canvas { @@ -205,6 +206,7 @@ message Section { SectionType sectionType = 6; // 区段类型 repeated string axleCountings = 7; // 关联的计轴(岔区&&非岔区) repeated string children = 8; // 下属逻辑区段id(非岔区) + string destinationCode = 9; // 目的地码 } /** 逻辑区段 */ @@ -224,7 +226,7 @@ message PathLine { CommonInfo common = 1; string code = 2; repeated Point points = 3; - bool isUp = 4; // 是否上行 + bool isUp = 4; // 是否上行 repeated KilometerPoint kilometerPoints = 5; // 车站对应的公里标以及坐标点 bool isKmIncrease = 6; // 运行方向是否公里标递增 } From f1dfb5e4bdcce8df58c34c0c2cbce545db559a68 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Tue, 18 Jul 2023 13:56:54 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E8=BD=A6=E6=AC=A1=E7=AA=97=E5=85=B3?= =?UTF-8?q?=E8=81=94=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index f7e9086..6fce03d 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -126,7 +126,7 @@ message StationLine { message TrainWindow { CommonInfo common = 1; string code = 2; - string sectionId = 3; + repeated string refDeviceId = 3; //关联的逻辑区段的id或由道岔区段生成所关联的道岔id } message AxleCounting { From bdd31520921ff98b084d126dfab63e99f5ebc3b6 Mon Sep 17 00:00:00 2001 From: Yuan Date: Wed, 19 Jul 2023 09:00:00 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E7=89=A9=E7=90=86=E5=8C=BA=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index f7e9086..59450b5 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -205,8 +205,8 @@ message Section { RelatedRef pbRef = 5; // 区段B端关联的物理区段或道岔(非岔区) SectionType sectionType = 6; // 区段类型 repeated string axleCountings = 7; // 关联的计轴(岔区&&非岔区) - repeated string children = 8; // 下属逻辑区段id(非岔区) - string destinationCode = 9; // 目的地码 + repeated string children = 8; // 下属逻辑区段id(非岔区)/下属道岔id(岔区) + string destinationCode = 9; // 目的地码 } /** 逻辑区段 */