From fba9d6979557d3b4ef2e3b3dbab1c907fcdd44f7 Mon Sep 17 00:00:00 2001 From: weizhihong Date: Wed, 8 Nov 2023 11:25:44 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E7=AB=99?= =?UTF-8?q?=E5=8F=B0=E5=B1=8F=E8=94=BD=E9=97=A8=E6=B6=88=E6=81=AF=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_state.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/device_state.proto b/protos/device_state.proto index 92e6c22..f200271 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -111,7 +111,7 @@ message PlatformState{ // SPKS继电器状态 repeated ReplyState spksState = 3; // 门控箱继电器状态 - repeated MkxJState mkxJState = 4; + MkxJState mkxJState = 4; } //车站状态 message StationState{ From 40592a05d10acdd1d940138d90b46be1b0f21543 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Wed, 8 Nov 2023 13:09:06 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=BB=84=E5=90=88?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=97=E8=A1=A8+=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=85=B3=E8=81=94=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E6=96=AD?= =?UTF-8?q?=E8=B7=AF=E5=99=A8=E5=92=8C=E7=94=B5=E6=BA=90=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/relayCabinetLayoutGraphics.proto | 2 +- protos/stationLayoutGraphics.proto | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/protos/relayCabinetLayoutGraphics.proto b/protos/relayCabinetLayoutGraphics.proto index 63239f0..263b083 100644 --- a/protos/relayCabinetLayoutGraphics.proto +++ b/protos/relayCabinetLayoutGraphics.proto @@ -12,7 +12,7 @@ message RelayCabinetGraphicStorage { //string belongsConcentrationStation = 5;//继电器柜图所属集中站 UniqueIdType UniqueIdPrefix = 6;//设备唯一编码--前缀 repeated PhaseFailureProtector phaseFailureProtectors = 7; - repeated Combinationtype combinationtypeList = 8; + //repeated Combinationtype combinationtypeList = 8; repeated SignalFaultAlarm signalFaultAlarms = 9; CiCj ciCjList = 10;//采集列表 CiQd ciQdList = 11;//驱动列表 diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 7cff870..43aea38 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -283,6 +283,8 @@ message RelatedRef { station = 6; ScreenDoor = 7; SignalFaultAlarm = 8; + Breakers = 9;//断路器 + PowerScreen = 10;//电源屏 } enum DevicePort { From 11934a17086de65b591b9f23609f831f409fab96 Mon Sep 17 00:00:00 2001 From: weizhihong Date: Wed, 8 Nov 2023 14:49:02 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=88=97=E8=BD=A6?= =?UTF-8?q?=E4=B8=ADuid=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_state.proto | 2 -- 1 file changed, 2 deletions(-) diff --git a/protos/device_state.proto b/protos/device_state.proto index f200271..457890b 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -150,8 +150,6 @@ message TrainState{ int64 trainKilometer = 14; // 控制响应延时 int64 controlDelayTime = 15; - // 列车车头所在设备UID - string headDeviceUId = 16; } // 动力学列车状态 From 3dddb31503eddd794b391a2e17c4f0e11467c2f6 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Wed, 8 Nov 2023 16:13:36 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E9=97=A8=E9=85=8D=E7=BD=AE--=E5=AD=90=E9=97=A8=E5=92=8C?= =?UTF-8?q?=E7=BC=96=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 43aea38..99204a2 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -41,6 +41,7 @@ message RtssGraphicStorage { repeated ScreenDoor screenDoors = 33; repeated StationRelateDevice stationRelateDeviceList = 34; // 关联设备列表 repeated SectionCodePoint sectionCodePointList = 35; // 物理区段码位表 + ScreenDoorConfig screenDoorConfig = 36;//屏蔽门的配置--子屏蔽门的数量和编组列表 } message Canvas { @@ -133,9 +134,14 @@ message Platform { message ScreenDoor { CommonInfo common = 1; string code = 2; - int32 sonDoorAmount = 3; //子屏蔽门的数量 + //int32 sonDoorAmount = 3; //子屏蔽门的数量 string refPlatformId = 4; //关联的站台 - repeated ScreenDoorGroup screenDoorGroupList = 5;//编组列表 + //repeated ScreenDoorGroup screenDoorGroupList = 5;//编组列表 +} + +message ScreenDoorConfig { + int32 sonDoorAmount = 1; //子屏蔽门的数量 + repeated ScreenDoorGroup screenDoorGroupList = 2;//编组列表 } message ScreenDoorGroup { From 5b6e90cf4ebeacaa761ffe57063b2eba3444c569 Mon Sep 17 00:00:00 2001 From: joylink_zhangsai <1021828630@qq.com> Date: Thu, 9 Nov 2023 10:53:22 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=97=B4=E9=9A=99?= =?UTF-8?q?=E6=8E=A2=E6=B5=8B=E7=BB=A7=E7=94=B5=E5=99=A8=E5=8F=8A=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=80=BB=E8=BE=91=EF=BC=9B=E4=BF=AE=E6=94=B9=E5=B1=8F?= =?UTF-8?q?=E8=94=BD=E9=97=A8=E6=8E=A7=E5=88=B6=E9=80=BB=E8=BE=91=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/request.proto | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/protos/request.proto b/protos/request.proto index a68e3cc..4e57ec5 100644 --- a/protos/request.proto +++ b/protos/request.proto @@ -66,6 +66,7 @@ message Section { message Psd { enum Operation { Undefined = 0; + //屏蔽门控制 Km4 = 1; //四编组开门 CancelKm4 = 2; //取消四编组开门 Km8 = 3; //八编组开门 @@ -76,11 +77,16 @@ message Psd { ForceKm8 = 8; //强制八编组开门 ForceGm = 9; //强制关门 CancelForce = 10; //取消强制 - + //屏蔽门故障 AsdCannotOpen = 11; //滑动门无法开门 CancelAsdCannotOpen = 12; //取消滑动门无法开门 AsdCannotClose = 13; //滑动门无法关闭 CancelAsdCannotClose = 14; //取消滑动门无法关闭 + //间隙探测 + QDTC = 15; //启动探测 + CancelQDTC = 16; //取消启动探测 + TZTC = 17; //停止探测 + CancelTZTC = 18; //取消停止探测 } } From 3d3461d09bff61ca6b4ccba7378eaee3b2437a5f Mon Sep 17 00:00:00 2001 From: weizhihong Date: Thu, 9 Nov 2023 18:01:39 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E7=BB=99?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=8F=91=E9=80=81=E7=9A=84=E9=81=93=E5=B2=94?= =?UTF-8?q?=E5=8D=A0=E7=94=A8=E7=8A=B6=E6=80=81=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_state.proto | 2 ++ 1 file changed, 2 insertions(+) diff --git a/protos/device_state.proto b/protos/device_state.proto index 457890b..cec1fea 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -71,6 +71,8 @@ message SwitchState{ bool fc = 15; // 是否允许操作 bool yc = 16; + // 是否占用 + bool occupied = 17; } //信号机状态 message SignalState{ From ee2e7aa2d6a3a6ab3cbe5b4057610a9b73d42a67 Mon Sep 17 00:00:00 2001 From: fan Date: Fri, 10 Nov 2023 09:23:27 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=A1=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 99204a2..ad64fc0 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -42,6 +42,7 @@ message RtssGraphicStorage { repeated StationRelateDevice stationRelateDeviceList = 34; // 关联设备列表 repeated SectionCodePoint sectionCodePointList = 35; // 物理区段码位表 ScreenDoorConfig screenDoorConfig = 36;//屏蔽门的配置--子屏蔽门的数量和编组列表 + repeated Beacon beacons = 37; } message Canvas { @@ -451,6 +452,18 @@ message CurvatureKiloMarker { repeated KilometerSystem kilometerSystem = 4; //公里标数据 } +/** 信标 */ +message Beacon { + enum BeaconType { + Static = 0; + Dynamic = 1; + } + CommonInfo common = 1; + string code = 2; + BeaconType type = 3; + bool flip = 4; +} + message Slope { CommonInfo common = 1; repeated Point points = 2; From 7ab9e3b83c8bfb7aedad3c50d13c6cc02f5ed98a Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Fri, 10 Nov 2023 15:07:30 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=AE=A1=E8=BD=B4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index ad64fc0..d661621 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -43,6 +43,7 @@ message RtssGraphicStorage { repeated SectionCodePoint sectionCodePointList = 35; // 物理区段码位表 ScreenDoorConfig screenDoorConfig = 36;//屏蔽门的配置--子屏蔽门的数量和编组列表 repeated Beacon beacons = 37; + GenerateAxleCountingConfig generateAxleCountingConfig = 38;//一键生成计轴的配置 } message Canvas { @@ -185,6 +186,10 @@ message AxleCounting { repeated string centralizedStations = 8; // 集中站列表 } +message GenerateAxleCountingConfig { + repeated string bbConnect = 1; //需要在道岔bb连接处生成计轴的道岔id(填一个就行) +} + // message Train { // CommonInfo common = 1; // string code = 2; From 2d58198cfcc400b51e9f3eb1bee162ad117abbed Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Fri, 10 Nov 2023 17:13:56 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=AE=A1=E8=BD=B4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0=E6=8C=87=E5=AE=9A=E7=9A=84?= =?UTF-8?q?=E9=81=93=E5=B2=94=E7=BB=84=E4=B8=8D=E7=94=9F=E6=88=90=E8=AE=A1?= =?UTF-8?q?=E8=BD=B4?= 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 d661621..8a6625f 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -188,6 +188,7 @@ message AxleCounting { message GenerateAxleCountingConfig { repeated string bbConnect = 1; //需要在道岔bb连接处生成计轴的道岔id(填一个就行) + repeated string noGenerateGroup = 2;//指定的道岔组不生成计轴 } // message Train { From a0dbaab3dc5c3517640d8f02d097e62f233755cb Mon Sep 17 00:00:00 2001 From: weizhihong Date: Mon, 13 Nov 2023 14:11:58 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E5=88=97?= =?UTF-8?q?=E8=BD=A6=E8=BD=AE=E5=BE=84=E4=BF=A1=E6=81=AF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_state.proto | 2 ++ 1 file changed, 2 insertions(+) diff --git a/protos/device_state.proto b/protos/device_state.proto index cec1fea..222796b 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -152,6 +152,8 @@ message TrainState{ int64 trainKilometer = 14; // 控制响应延时 int64 controlDelayTime = 15; + // 列车轮径 + int32 wheelDiameter = 16; } // 动力学列车状态