From 81363b68ea2d12fa66c74c103b82dbc921a85889 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Fri, 21 Jul 2023 10:00:25 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 1958d92..aa8f044 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -105,8 +105,9 @@ message Platform { string code = 2; bool hasdoor = 3; // 是否有屏蔽门 string direction = 4; // 行驶方向--屏蔽门上下 - string upAndDown =5; //上下行--upLink表示上行，downLink表示下行 + //string upAndDown =5; //上下行--upLink表示上行，downLink表示下行 string refStation=6; //关联的车站 + bool up = 7;//上下行--true表示上行，false表示下行 } message Station { From e521fa9d3372987b45a4d9bdb63544cf4e1f088f Mon Sep 17 00:00:00 2001 From: joylink_zhangsai <1021828630@qq.com> Date: Fri, 21 Jul 2023 10:23:33 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E6=8B=9F?= =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=8E=A5=E5=8F=A3=EF=BC=9B=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=BB=98=E5=9B=BE=E6=95=B0=E6=8D=AE=E7=BB=B4=E6=8A=A4=EF=BC=9B?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=BE=AA=E7=8E=AF=E6=95=85=E9=9A=9C=E6=8A=A5?= =?UTF-8?q?=E8=AD=A6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/alertInfo.proto | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/protos/alertInfo.proto b/protos/alertInfo.proto index 6c6c332..499e7b8 100644 --- a/protos/alertInfo.proto +++ b/protos/alertInfo.proto @@ -20,13 +20,7 @@ message NccAlertInfoMessage { int32 alert_tip_id = 5; - //故障设备信息 - string device_info = 6; - - //导致报警的原因 - string reason = 7; + bool mock = 6; } repeated Message messages = 1; - - } From c29caf7b89fafccd60d217f436f95001d12859f4 Mon Sep 17 00:00:00 2001 From: weizhihong Date: Fri, 21 Jul 2023 16:59:30 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=85=AC=E9=87=8C?= =?UTF-8?q?=E6=A0=87=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_info.proto | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/protos/device_info.proto b/protos/device_info.proto index cca1715..c0bc7d0 100644 --- a/protos/device_info.proto +++ b/protos/device_info.proto @@ -15,17 +15,14 @@ message Section { // 关联区段 repeated string childrenId = 3; - // 公里标 - repeated graphicData.KilometerSystem kilometerSystem = 4; - - // 转换后的公里标数字 - repeated int64 convertKilometer = 5; - // 物理区段Id - string physicalSectionId = 6; - + string physicalSectionId = 4; + // 目的地码 - string destinationCode = 7; + string destinationCode = 5; + + // 公里标信息 + DeviceKilometer kilometer = 6; } // 道岔 @@ -35,10 +32,16 @@ message Turnout { string code = 2; - // 关联道岔的公里标 - repeated graphicData.KilometerSystem kilometerSystem = 3; - - // 转换后的公里标数字 - repeated int64 convertKilometer = 4; + // 公里标信息 + DeviceKilometer kilometer = 3; } +// 公共属性 +message DeviceKilometer { + + int64 minKilometer = 1; + + int64 maxKilometer = 2; + + repeated graphicData.KilometerSystem kilometerSystem = 3; +} \ No newline at end of file From e9ebd34921652f48c2d84ac531e392ce32d17bb5 Mon Sep 17 00:00:00 2001 From: joylink_zhangsai <1021828630@qq.com> Date: Mon, 24 Jul 2023 16:19:49 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=AD=A6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=86=85=E5=AE=B9=EF=BC=88proto=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/alertInfo.proto | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/protos/alertInfo.proto b/protos/alertInfo.proto index 499e7b8..7c1d8b7 100644 --- a/protos/alertInfo.proto +++ b/protos/alertInfo.proto @@ -16,11 +16,34 @@ message NccAlertInfoMessage { string alert_time = 3; - string info = 4; + int32 alert_tip_id = 4; - int32 alert_tip_id = 5; + int32 line_id = 5; - bool mock = 6; + string alert_object = 6; + + AlertType alert_type = 7; + + string locator_device_id = 8; + + bool mock = 9; } + + enum AlertType { + UNKNOWN = 0; + //蓝显 + BLUE_DISPLAY = 1; + //列车延误2分钟 + TRAIN_DELAY_2 = 2; + //列车延误10分钟 + TRAIN_DELAY_10 = 3; + //整侧站台门无关闭锁紧信号 + PLATFORM_DOOR_WITHOUT_LOCKED_SIGNAL = 4; + //整侧站台门无法打开 + PLATFORM_DOOR_CANNOT_OPEN = 5; + //整侧站台门无法关闭 + PLATFORM_DOOR_CANNOT_CLOSE = 6; + } + repeated Message messages = 1; } From 7567e2953eae654a6de703b6b1dfaedcc53d0e84 Mon Sep 17 00:00:00 2001 From: joylink_zhangsai <1021828630@qq.com> Date: Wed, 26 Jul 2023 09:56:53 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=A5=E8=AD=A6=E5=9C=B0=E7=82=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=9BAlertType=E5=92=8CAlertLocation=E4=BD=BF?= =?UTF-8?q?=E7=94=A8proto=E6=96=87=E4=BB=B6=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/alertConst.proto | 39 +++++++++++++++++++++++++++++++++++++++ protos/alertInfo.proto | 17 +---------------- 2 files changed, 40 insertions(+), 16 deletions(-) create mode 100644 protos/alertConst.proto diff --git a/protos/alertConst.proto b/protos/alertConst.proto new file mode 100644 index 0000000..75014c6 --- /dev/null +++ b/protos/alertConst.proto @@ -0,0 +1,39 @@ +syntax = "proto3"; + +package alert; + + +//模型的可变的状态数据 +//import "LineNetTrainOffsetDiagram.proto"; +option java_package = "club.joylink.xiannccda.dto.protos"; +option java_outer_classname = "AlertConstProto"; + +enum AlertLocation { + ALERT_LOCATION_UNKNOWN = 0; + //全线 + QX = 1; + //鱼化寨联锁区 + YHZ_LSQ = 2; + //胡家庙联锁区 + HJM_LSQ = 3; + //北池头联锁区 + BCT_LSQ = 4; + //保税区联锁区 + BSQ_LSQ = 5; +} + +enum AlertType { + ALERT_TYPE_UNKNOWN = 0; + //蓝显 + BLUE_DISPLAY = 1; + //列车延误2分钟 + TRAIN_DELAY_2 = 2; + //列车延误10分钟 + TRAIN_DELAY_10 = 3; + //整侧站台门无关闭锁紧信号 + PLATFORM_DOOR_WITHOUT_LOCKED_SIGNAL = 4; + //整侧站台门无法打开 + PLATFORM_DOOR_CANNOT_OPEN = 5; + //整侧站台门无法关闭 + PLATFORM_DOOR_CANNOT_CLOSE = 6; +} diff --git a/protos/alertInfo.proto b/protos/alertInfo.proto index 7c1d8b7..0bab24b 100644 --- a/protos/alertInfo.proto +++ b/protos/alertInfo.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package alert; +import "alertConst.proto"; //模型的可变的状态数据 //import "LineNetTrainOffsetDiagram.proto"; @@ -29,21 +30,5 @@ message NccAlertInfoMessage { bool mock = 9; } - enum AlertType { - UNKNOWN = 0; - //蓝显 - BLUE_DISPLAY = 1; - //列车延误2分钟 - TRAIN_DELAY_2 = 2; - //列车延误10分钟 - TRAIN_DELAY_10 = 3; - //整侧站台门无关闭锁紧信号 - PLATFORM_DOOR_WITHOUT_LOCKED_SIGNAL = 4; - //整侧站台门无法打开 - PLATFORM_DOOR_CANNOT_OPEN = 5; - //整侧站台门无法关闭 - PLATFORM_DOOR_CANNOT_CLOSE = 6; - } - repeated Message messages = 1; }