From bdd31520921ff98b084d126dfab63e99f5ebc3b6 Mon Sep 17 00:00:00 2001 From: Yuan Date: Wed, 19 Jul 2023 09:00:00 +0800 Subject: [PATCH 1/7] =?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; // 目的地码 } /** 逻辑区段 */ From bce5c4845f4ee3fb7959ea89378fdabd7b721ba2 Mon Sep 17 00:00:00 2001 From: weizhihong Date: Wed, 19 Jul 2023 09:20:54 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=88=B6=E7=BA=A7?= =?UTF-8?q?=E5=8C=BA=E6=AE=B5=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_info.proto | 3 +++ 1 file changed, 3 insertions(+) diff --git a/protos/device_info.proto b/protos/device_info.proto index 0b4f0d8..4cc01eb 100644 --- a/protos/device_info.proto +++ b/protos/device_info.proto @@ -23,6 +23,9 @@ message Section { // 转换后的公里标数字 repeated int64 convertKilometer = 7; + + // 父级区段 + Section section = 8; } // 道岔 From d9923fa1db254b71d1d165b7039fce43213ea33d Mon Sep 17 00:00:00 2001 From: weizhihong Date: Wed, 19 Jul 2023 10:17:42 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BA=E6=AE=B5?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_info.proto | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/protos/device_info.proto b/protos/device_info.proto index 4cc01eb..8fc637b 100644 --- a/protos/device_info.proto +++ b/protos/device_info.proto @@ -12,20 +12,17 @@ message Section { // 区段编码 string code = 2; - // 区段类型 - graphicData.Section.SectionType type = 3; - // 关联区段 - repeated Section children = 4; + repeated string childrenId = 3; // 公里标 - repeated graphicData.KilometerSystem kilometerSystem = 5; + repeated graphicData.KilometerSystem kilometerSystem = 4; // 转换后的公里标数字 - repeated int64 convertKilometer = 7; + repeated int64 convertKilometer = 5; // 父级区段 - Section section = 8; + Section section = 6; } // 道岔 From a6d24ad78990f95a7fb12084a70698fcbedb55f7 Mon Sep 17 00:00:00 2001 From: weizhihong Date: Wed, 19 Jul 2023 10:23:10 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=B0=86=E9=80=BB=E8=BE=91=E5=8C=BA?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=8C=BA=E6=AE=B5ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_info.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protos/device_info.proto b/protos/device_info.proto index 8fc637b..ca4cd84 100644 --- a/protos/device_info.proto +++ b/protos/device_info.proto @@ -21,8 +21,8 @@ message Section { // 转换后的公里标数字 repeated int64 convertKilometer = 5; - // 父级区段 - Section section = 6; + // 逻辑区段Id + string logicSectionId = 6; } // 道岔 From 90b6f4600e531c496d849163653acb80c6e933ea Mon Sep 17 00:00:00 2001 From: weizhihong Date: Wed, 19 Jul 2023 10:49:30 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_info.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protos/device_info.proto b/protos/device_info.proto index ca4cd84..3066fe0 100644 --- a/protos/device_info.proto +++ b/protos/device_info.proto @@ -21,8 +21,8 @@ message Section { // 转换后的公里标数字 repeated int64 convertKilometer = 5; - // 逻辑区段Id - string logicSectionId = 6; + // 物理区段Id + string physicalSectionId = 6; } // 道岔 From eb0ad6e4305642b6619f5e97d1498ad5dc5a6d42 Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Wed, 19 Jul 2023 11:19:20 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_status.proto | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/protos/device_status.proto b/protos/device_status.proto index 5e9a78b..99d71a9 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 From e9804dd24b80e7f2423dc2559e70475215c62fd5 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Thu, 20 Jul 2023 11:10:25 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=BD=A6=E7=AB=99=E5=90=8D=E5=AD=97--?= =?UTF-8?q?=E7=AB=99=E5=8F=B0=E4=B8=8A=E4=B8=8B=E8=A1=8C=E5=92=8C=E5=85=B3?= =?UTF-8?q?=E8=81=94=E8=BD=A6=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index a770aa4..a77af79 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -105,6 +105,8 @@ message Platform { string code = 2; bool hasdoor = 3; // 是否有屏蔽门 string direction = 4; // 行驶方向--屏蔽门上下 + string upAndDown =5; //上下行--upLink表示上行，downLink表示下行 + string refStation=6; //关联的车站 } message Station { @@ -112,8 +114,9 @@ message Station { string code = 2; bool hasControl = 3; // 是否有控制 bool concentrationStations = 4; //是否集中站 - // string kilometerCode = 5; //公里标 + // string kilometerCode = 5; //公里标 KilometerSystem kilometerSystem = 6; //公里标 + string name = 7; } message StationLine {