From d82140370ef78529ad745356e41bad635a333457 Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Mon, 4 Sep 2023 11:13:10 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E9=97=A8=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E6=9B=B4=E6=94=B9=EF=BC=8C=E5=88=AB=E7=9A=84=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/trainShedule.proto | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 protos/trainShedule.proto diff --git a/protos/trainShedule.proto b/protos/trainShedule.proto new file mode 100644 index 0000000..c1df6a1 --- /dev/null +++ b/protos/trainShedule.proto @@ -0,0 +1,24 @@ +syntax = "proto3"; + +package alert; + + +//模型的可变的状态数据 +//import "LineNetTrainOffsetDiagram.proto"; +option java_package = "club.joylink.xiannccda.dto.protos"; +option java_outer_classname = "TrainShedule"; +message Plan{ + int32 lineId = 1; + int64 date = 2; + int32 actionId = 3; + string trainId = 4; + string globalId = 5; + int32 stationId = 6; + int32 platformId = 7; + int64 aTime = 8; + int64 dTime = 9; + bool upWay = 10; + int64 timestamp = 11; + //接受时间 + int64 receiveTime = 12; +} \ No newline at end of file From da3fb50a050cb48ae2f90c082178ffaba6634967 Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Wed, 6 Sep 2023 09:58:36 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E7=AB=99=E5=8F=B0=E9=97=A8=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=AF=B7=E6=B1=82=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E8=BF=90=E8=A1=8C=E5=9B=BE=EF=BC=8C=E5=88=97=E8=BD=A6?= =?UTF-8?q?atp=E5=88=87=E9=99=A4=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/trainShedule.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protos/trainShedule.proto b/protos/trainShedule.proto index c1df6a1..e52e89e 100644 --- a/protos/trainShedule.proto +++ b/protos/trainShedule.proto @@ -21,4 +21,5 @@ message Plan{ int64 timestamp = 11; //接受时间 int64 receiveTime = 12; + int32 flag = 13; } \ No newline at end of file From 5034d44793497699ba8a2e5a2b6312e5a5b7e8f2 Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Mon, 18 Sep 2023 16:22:11 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=86=B3=E7=AD=96=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E9=AB=98=E5=B3=B0=E6=97=B6=E9=97=B4=E6=AE=B5?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/alertConst.proto | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/protos/alertConst.proto b/protos/alertConst.proto index 05eea72..4dfe7fa 100644 --- a/protos/alertConst.proto +++ b/protos/alertConst.proto @@ -61,3 +61,13 @@ enum AlertType { //全线蓝显 ALL_LINE_BLUE_DISPLAY = 19; } +enum TipTimeConfig{ + //假期早高峰 + HOLIDAYS_MORN_PEAK = 0; + //假期晚高峰 + HOLIDAYS_EVENING_PEAK = 1; + //早高峰 + MORN_PEAK = 2; + //晚高峰 + EVENING_PEARK = 3; +} \ No newline at end of file From a7ca4ffd25fcc6498030f78d1aa046ea10ef2f54 Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Mon, 18 Sep 2023 16:34:46 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/alertConst.proto | 2 ++ 1 file changed, 2 insertions(+) diff --git a/protos/alertConst.proto b/protos/alertConst.proto index 4dfe7fa..3fc3c62 100644 --- a/protos/alertConst.proto +++ b/protos/alertConst.proto @@ -70,4 +70,6 @@ enum TipTimeConfig{ MORN_PEAK = 2; //晚高峰 EVENING_PEARK = 3; + //低峰 + NORMAL_UNPEARK = 4; } \ No newline at end of file From ba641f03f434b0bbde9617b9dc467414508296b7 Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Tue, 19 Sep 2023 10:23:16 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=81=94=E9=94=81?= =?UTF-8?q?=E5=8C=BA=E5=91=8A=E8=AD=A6=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/alertConst.proto | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/protos/alertConst.proto b/protos/alertConst.proto index 3fc3c62..365974a 100644 --- a/protos/alertConst.proto +++ b/protos/alertConst.proto @@ -60,6 +60,11 @@ enum AlertType { TRAIN_EB_ATP = 18; //全线蓝显 ALL_LINE_BLUE_DISPLAY = 19; + //联锁区红光带 + AXLE_LED_RED_INTERLOCK_AREA = 20; + //联锁区橙光带 + AXLE_LED_ORANGE_INTERLOCK_AREA = 21; + } enum TipTimeConfig{ //假期早高峰 From 614ea0ed42e8e4f892e2db0000c3285bac4fe338 Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Mon, 25 Sep 2023 14:26:47 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/alertConst.proto | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/protos/alertConst.proto b/protos/alertConst.proto index 365974a..c46c504 100644 --- a/protos/alertConst.proto +++ b/protos/alertConst.proto @@ -64,6 +64,10 @@ enum AlertType { AXLE_LED_RED_INTERLOCK_AREA = 20; //联锁区橙光带 AXLE_LED_ORANGE_INTERLOCK_AREA = 21; + //一级联锁 + INTERLOCK_LEVEL_ONE = 26; + //二级联锁 + INTERLOCK_LEVEL_TWO = 27; } enum TipTimeConfig{ From a9017ecfb22febc327a7b761a269c4a06749925b Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Wed, 27 Sep 2023 13:15:42 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=81=94=E9=94=81?= =?UTF-8?q?=E5=8C=BA=E9=81=93=E5=B2=94=E5=A4=B1=E8=A1=A8=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/alertConst.proto | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/protos/alertConst.proto b/protos/alertConst.proto index c46c504..6cae0cb 100644 --- a/protos/alertConst.proto +++ b/protos/alertConst.proto @@ -64,10 +64,11 @@ enum AlertType { AXLE_LED_RED_INTERLOCK_AREA = 20; //联锁区橙光带 AXLE_LED_ORANGE_INTERLOCK_AREA = 21; + //联锁区失表 + SWITCH_LOST_INTERLOCK_AREA = 22; //一级联锁 - INTERLOCK_LEVEL_ONE = 26; - //二级联锁 - INTERLOCK_LEVEL_TWO = 27; + INTERLOCK_LEVEL_ONE = 23; + } enum TipTimeConfig{ From 60cc131194d45259a5eef731fd4f6d2a419cd039 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Tue, 24 Oct 2023 18:05:21 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E7=BA=BF=E7=BD=91=E8=BD=A6=E7=AB=99?= =?UTF-8?q?=E5=8A=A0=E9=A2=9C=E8=89=B2=E9=80=89=E6=8B=A9?= 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 2b63d7d..414b790 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -121,10 +121,15 @@ message Station { } message StationLine { + enum stationColor { + orange = 0; + gray = 1; + } CommonInfo common = 1; string code = 2; bool hasTransfer = 3; // 是否有换乘图标 bool hideName = 4; + stationColor codeColor = 5; } message TrainWindow {