From 1075d04e59904dcffccd61799af868b6e21f7174 Mon Sep 17 00:00:00 2001 From: xzb <223@qq.com> Date: Fri, 9 Jun 2023 17:30:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?ncc=E5=8D=8F=E8=AE=AEx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_status.proto | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/protos/device_status.proto b/protos/device_status.proto index 14cc6f5..820de64 100644 --- a/protos/device_status.proto +++ b/protos/device_status.proto @@ -108,6 +108,8 @@ message Switch{ bool ipSingleSwitchStusLostIndication = 27; //设备唯一识别码，一般为设备名称 string id = 28; + //限速值KM/H + int32 speedLimit = 29; } message Track{ @@ -142,6 +144,10 @@ message Platform{ bool downTrainSkipstop = 13; //设备唯一识别码，一般为设备名称 string id = 14; + //下一区间运行时间 + int32 nextSectionRunTime = 15; + //下一区间运行等级 + int32 nextSectionRunLevel = 16; } message Scada{ @@ -212,3 +218,16 @@ message TrainMode{ //设备唯一识别码，一般为设备名称 string id = 35; } + +////////////////////////////////////////////////////////////////////// + +//2.7.2 信息源网络状态消息 +//NCC FEP与OCC FEP 间的网络连接状态 +message OccNccFepNetwork{ + //当前线路号 + string id = 1; + //true 代表与当前线路号的信息源(server)连接正常 + //false 代表断开 + bool active = 2; +} + From 0bcc9d223a1f938fb71a16b96a3d9a7ccaa69e32 Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Fri, 9 Jun 2023 17:55:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=9D=9E=E5=AE=9E=E6=97=B6=E6=B6=88?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/Device.proto | 41 ---- protos/LineNetTrainOffset.proto | 14 +- protos/device_status.proto | 376 ++++++++++++++++---------------- 3 files changed, 200 insertions(+), 231 deletions(-) delete mode 100644 protos/Device.proto diff --git a/protos/Device.proto b/protos/Device.proto deleted file mode 100644 index a19e590..0000000 --- a/protos/Device.proto +++ /dev/null @@ -1,41 +0,0 @@ -syntax = "proto3"; - -option java_package = "club.joylink.xiannccda.dto.protos"; -option java_outer_classname = "DeviceProto"; -message Device{ - int32 lineId = 1; - int32 reportId = 2; - -} - -message DeviceDetail{ - string deviceType = 1; - string deviceName = 2; - // int32 status = 3; - -} -message Track{ - Device device = 1; - DeviceDetail detail = 2; - //限速 - float speedLimit = 3; - //限速类型 - // 为1时，CBTC限速； - // 为2时，联锁限速； - // 为4时，同时限速。 - int32 limitType = 4; -} - -message Platform{ - Device device = 1; - DeviceDetail detail = 2; - //停站时间 - int32 stopTime = 3; -} - -message Switch{ - Device device = 1; - DeviceDetail detail = 2; - //限速 - float speedLimit = 3; -} \ No newline at end of file diff --git a/protos/LineNetTrainOffset.proto b/protos/LineNetTrainOffset.proto index 6166709..f39a97b 100644 --- a/protos/LineNetTrainOffset.proto +++ b/protos/LineNetTrainOffset.proto @@ -11,16 +11,18 @@ message LineNetTrainOffset{ //方向 int32 dir = 3; // true-到达，false-出发 - bool initType = 4; + // bool initType = 4; //位置 - int32 offset = 5; + // int32 offset = 5; //目的地id - int32 destinationId = 6; + // int32 destinationId = 6; //后方车站 - int32 backId = 7; + // int32 backId = 7; //是否删除 bool show = 8; - //完成率 - float rate = 9; + //车次窗编号 + int32 windowNo = 9; + //车次窗位置 + int32 windowOffset = 10; } diff --git a/protos/device_status.proto b/protos/device_status.proto index 820de64..77b6253 100644 --- a/protos/device_status.proto +++ b/protos/device_status.proto @@ -5,218 +5,226 @@ option java_package = "club.joylink.xiannccda.dto.protos"; option java_outer_classname = "DeviceStatusProto"; message Rtu{ - bool ipRtuStusDown = 1; - bool ipRtuStusInLocalCtrl = 2; - bool ipRtuStusInCentralCtrl = 3; - bool ipRtuStusInEmergencyCtrl = 4; - //设备唯一识别码，一般为设备名称 - string id = 5; + bool ipRtuStusDown = 1; + bool ipRtuStusInLocalCtrl = 2; + bool ipRtuStusInCentralCtrl = 3; + bool ipRtuStusInEmergencyCtrl = 4; + //设备唯一识别码，一般为设备名称 + string id = 5; } message Station{ - bool ipStaStusTermMode1 = 1; - bool ipStaStusTermMode2 = 2; - bool ipStaStusTermMode3 = 3; - bool ipStaStusTermMode4 = 4; - bool ipStaStusTermMode5 = 5; - bool ipStaStusTermMode6 = 6; - bool ipStaStusExpectTermMode1 = 7; - bool ipStaStusExpectTermMode2 = 8; - bool ipStaStusExpectTermMode3 = 9; - bool ipStaStusExpectTermMode4 = 10; - bool ipStaStusExpectTermMode5 = 11; - bool ipStaStusExpectTermMode6 = 12; - bool ipStaStusInCycle1 = 13; - bool ipStaStusInCycle2 = 14; - bool ipStaStusInCycle3 = 15; - bool ipStaStusInCycle4 = 16; - bool ipStaStusInCycle5 = 17; - bool ipStaStusInCycle6 = 18; - bool ipStaStusExpectCycle1 = 19; - bool ipStaStusExpectCycle2 = 20; - bool ipStaStusExpectCycle3 = 21; - bool ipStaStusExpectCycle4 = 22; - bool ipStaStusExpectCycle5 = 23; - bool ipStaStusExpectCycle6 = 24; - //设备唯一识别码，一般为设备名称 - string id = 25; + bool ipStaStusTermMode1 = 1; + bool ipStaStusTermMode2 = 2; + bool ipStaStusTermMode3 = 3; + bool ipStaStusTermMode4 = 4; + bool ipStaStusTermMode5 = 5; + bool ipStaStusTermMode6 = 6; + bool ipStaStusExpectTermMode1 = 7; + bool ipStaStusExpectTermMode2 = 8; + bool ipStaStusExpectTermMode3 = 9; + bool ipStaStusExpectTermMode4 = 10; + bool ipStaStusExpectTermMode5 = 11; + bool ipStaStusExpectTermMode6 = 12; + bool ipStaStusInCycle1 = 13; + bool ipStaStusInCycle2 = 14; + bool ipStaStusInCycle3 = 15; + bool ipStaStusInCycle4 = 16; + bool ipStaStusInCycle5 = 17; + bool ipStaStusInCycle6 = 18; + bool ipStaStusExpectCycle1 = 19; + bool ipStaStusExpectCycle2 = 20; + bool ipStaStusExpectCycle3 = 21; + bool ipStaStusExpectCycle4 = 22; + bool ipStaStusExpectCycle5 = 23; + bool ipStaStusExpectCycle6 = 24; + //设备唯一识别码，一般为设备名称 + string id = 25; } message Signal{ - bool redOpen = 1; - bool redFlash = 2; - bool greenOpen = 3; - bool greenFlash = 4; - bool yellowOpen = 5; - bool yellowFlash = 6; - bool whiteOpen = 7; - bool whiteFlash = 8; - bool blueOpen = 9; - bool blueFlash = 10; - bool fleetMode = 11; - bool ctrlFleetMode = 12; - bool autoMode = 13; - bool ctrlAutoMode = 14; - bool extinguish = 15; - bool approachLock = 16; - bool protectRoute = 17; - bool autoRouteDisable = 18; - bool callon = 19; - bool yellowYellow = 20; - bool yellowGreen = 21; - bool blocked = 22; - bool lampFailure = 23; - //设备唯一识别码，一般为设备名称 - string id = 24; + bool redOpen = 1; + bool redFlash = 2; + bool greenOpen = 3; + bool greenFlash = 4; + bool yellowOpen = 5; + bool yellowFlash = 6; + bool whiteOpen = 7; + bool whiteFlash = 8; + bool blueOpen = 9; + bool blueFlash = 10; + bool fleetMode = 11; + bool ctrlFleetMode = 12; + bool autoMode = 13; + bool ctrlAutoMode = 14; + bool extinguish = 15; + bool approachLock = 16; + bool protectRoute = 17; + bool autoRouteDisable = 18; + bool callon = 19; + bool yellowYellow = 20; + bool yellowGreen = 21; + bool blocked = 22; + bool lampFailure = 23; + //设备唯一识别码，一般为设备名称 + string id = 24; } message Entry{ - bool dirLeft = 1; - bool dirRight = 2; - bool dirLocked = 3; - //设备唯一识别码，一般为设备名称 - string id = 4; + bool dirLeft = 1; + bool dirRight = 2; + bool dirLocked = 3; + //设备唯一识别码，一般为设备名称 + 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; - //设备唯一识别码，一般为设备名称 - string id = 28; - //限速值KM/H - int32 speedLimit = 29; + 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; + //设备唯一识别码，一般为设备名称 + string id = 28; + //限速值KM/H + int32 speedLimit = 29; } message Track{ - bool ciOccupied = 1; - bool cbtcOccupied = 2; - bool locked = 3; - bool failLocked = 4; - bool expectLock = 5; - bool expectUnlock = 6; - bool inRoute = 7; - bool cut = 8; - bool atcInvalid = 9; - bool overlap = 10; - bool blocked = 11; - //设备唯一识别码，一般为设备名称 - string id = 12; + bool ciOccupied = 1; + bool cbtcOccupied = 2; + bool locked = 3; + bool failLocked = 4; + bool expectLock = 5; + bool expectUnlock = 6; + bool inRoute = 7; + bool cut = 8; + bool atcInvalid = 9; + bool overlap = 10; + bool blocked = 11; + //设备唯一识别码，一般为设备名称 + string id = 12; + + //限速 + float speedLimit = 13; + //限速类型 + // 为1时，CBTC限速； + // 为2时，联锁限速； + // 为4时，同时限速。 + int32 limitType = 14; } message Platform{ - bool emergstop = 1; - bool trainberth = 2; - bool close = 3; - bool upHold = 4; - bool downHold = 5; - bool upOccHold = 6; - bool downOccHold = 7; - bool psdOpen = 8; - bool psdCut = 9; - bool upSkipstop = 10; - bool downSkipstop = 11; - bool upTrainSkipstop = 12; - bool downTrainSkipstop = 13; - //设备唯一识别码，一般为设备名称 - string id = 14; - //下一区间运行时间 - int32 nextSectionRunTime = 15; - //下一区间运行等级 - int32 nextSectionRunLevel = 16; + bool emergstop = 1; + bool trainberth = 2; + bool close = 3; + bool upHold = 4; + bool downHold = 5; + bool upOccHold = 6; + bool downOccHold = 7; + bool psdOpen = 8; + bool psdCut = 9; + bool upSkipstop = 10; + bool downSkipstop = 11; + bool upTrainSkipstop = 12; + bool downTrainSkipstop = 13; + //设备唯一识别码，一般为设备名称 + string id = 14; + //下一区间运行时间 + int32 nextSectionRunTime = 15; + //下一区间运行等级 + int32 nextSectionRunLevel = 16; } message Scada{ - bool scadaOn = 1; - bool scadaSinglePower = 2; - bool scadaUnkown = 3; - //设备唯一识别码，一般为设备名称 - string id = 4; + bool scadaOn = 1; + bool scadaSinglePower = 2; + bool scadaUnkown = 3; + //设备唯一识别码，一般为设备名称 + string id = 4; } message WaterProofDoor{ - bool doorClosed = 1; - bool doorExpectClose = 2; - bool doorAgreeClosed = 3; - bool doorClosing = 4; - bool doorOpenLock = 5; - //设备唯一识别码，一般为设备名称 - string id = 6; + bool doorClosed = 1; + bool doorExpectClose = 2; + bool doorAgreeClosed = 3; + bool doorClosing = 4; + bool doorOpenLock = 5; + //设备唯一识别码，一般为设备名称 + string id = 6; } message WorkArea{ - bool ipStusWorkAreaEnable = 1; - //设备唯一识别码，一般为设备名称 - string id = 2; + bool ipStusWorkAreaEnable = 1; + //设备唯一识别码，一般为设备名称 + string id = 2; } message Gama{ - bool ipStusGamaDisable = 1; - //设备唯一识别码，一般为设备名称 - string id = 2; + bool ipStusGamaDisable = 1; + //设备唯一识别码，一般为设备名称 + string id = 2; } message TrainMode{ - bool ipModeTrainTypeManual = 1; - bool ipModeTrainTypeHead = 2; - bool ipModeTrainTypeSpecial = 3; - bool ipModeTrainTypeSchedule = 4; - bool ipModeTrainTypeRoute = 5; - bool ipModeTrainTypeShuttle = 6; - bool ipModeTrainTypeLineup = 7; - bool ipModeTrainSchdEarly = 8; - bool ipModeTrainSchdLate = 9; - bool ipModeTrainSkipstop = 10; - bool ipModeTrainCbtcMode = 11; - bool ipModeTrainAtpCut = 12; - bool ipModeTrainBerthed = 13; - bool ipModeTrainStoped = 14; - bool ipModeTrainHolded = 15; - bool ipModeTrainItama = 16; - bool ipModeTrainDirUp = 17; - bool ipModeTrainDirDown = 18; - bool ipModeTrainDirHeadUp = 19; - bool ipModeTrainDirHeadDown = 20; - bool ipModeTrainDoorOpen = 21; - bool ipModeTrainRsAlarm = 22; - bool ipModeTrainDoorAlarm = 23; - bool ipModeTrainEbAlarm = 24; - bool ipModeTrainIntegrityAlarm = 25; - bool ipModeTrainDriveModeAm = 26; - bool ipModeTrainDriveModeCm = 27; - bool ipModeTrainDriveModeRmf = 28; - bool ipModeTrainDriveModeDto = 29; - bool ipModeTrainDriveModeAtb = 30; - bool ipModeTrainDriveBlockAm = 31; - bool ipModeTrainDriveBlockCm = 32; - bool ipModeTrainDriveModeRmr = 33; - bool ipModeTrainDriveModeWash = 34; - //设备唯一识别码，一般为设备名称 - string id = 35; + bool ipModeTrainTypeManual = 1; + bool ipModeTrainTypeHead = 2; + bool ipModeTrainTypeSpecial = 3; + bool ipModeTrainTypeSchedule = 4; + bool ipModeTrainTypeRoute = 5; + bool ipModeTrainTypeShuttle = 6; + bool ipModeTrainTypeLineup = 7; + bool ipModeTrainSchdEarly = 8; + bool ipModeTrainSchdLate = 9; + bool ipModeTrainSkipstop = 10; + bool ipModeTrainCbtcMode = 11; + bool ipModeTrainAtpCut = 12; + bool ipModeTrainBerthed = 13; + bool ipModeTrainStoped = 14; + bool ipModeTrainHolded = 15; + bool ipModeTrainItama = 16; + bool ipModeTrainDirUp = 17; + bool ipModeTrainDirDown = 18; + bool ipModeTrainDirHeadUp = 19; + bool ipModeTrainDirHeadDown = 20; + bool ipModeTrainDoorOpen = 21; + bool ipModeTrainRsAlarm = 22; + bool ipModeTrainDoorAlarm = 23; + bool ipModeTrainEbAlarm = 24; + bool ipModeTrainIntegrityAlarm = 25; + bool ipModeTrainDriveModeAm = 26; + bool ipModeTrainDriveModeCm = 27; + bool ipModeTrainDriveModeRmf = 28; + bool ipModeTrainDriveModeDto = 29; + bool ipModeTrainDriveModeAtb = 30; + bool ipModeTrainDriveBlockAm = 31; + bool ipModeTrainDriveBlockCm = 32; + bool ipModeTrainDriveModeRmr = 33; + bool ipModeTrainDriveModeWash = 34; + //设备唯一识别码，一般为设备名称 + string id = 35; } ////////////////////////////////////////////////////////////////////// @@ -224,10 +232,10 @@ message TrainMode{ //2.7.2 信息源网络状态消息 //NCC FEP与OCC FEP 间的网络连接状态 message OccNccFepNetwork{ - //当前线路号 - string id = 1; - //true 代表与当前线路号的信息源(server)连接正常 - //false 代表断开 - bool active = 2; + //当前线路号 + string id = 1; + //true 代表与当前线路号的信息源(server)连接正常 + //false 代表断开 + bool active = 2; } From 4f8242df2fd745f0cee50e4ea75096d0e9a8f1c6 Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Fri, 9 Jun 2023 17:55:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=9D=9E=E5=AE=9E=E6=97=B6=E6=B6=88?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/LineNetTrainOffset.proto | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/protos/LineNetTrainOffset.proto b/protos/LineNetTrainOffset.proto index f39a97b..3aebde0 100644 --- a/protos/LineNetTrainOffset.proto +++ b/protos/LineNetTrainOffset.proto @@ -19,10 +19,10 @@ message LineNetTrainOffset{ //后方车站 // int32 backId = 7; //是否删除 - bool show = 8; + bool show = 4; //车次窗编号 - int32 windowNo = 9; + int32 windowNo = 5; //车次窗位置 - int32 windowOffset = 10; + int32 windowOffset = 6; } From d624c01cc788650fbb03204d708b365e0692890c Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Fri, 9 Jun 2023 18:09:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=BA=BF=E7=BD=91=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/LineNetTrainOffset.proto | 8 -------- 1 file changed, 8 deletions(-) diff --git a/protos/LineNetTrainOffset.proto b/protos/LineNetTrainOffset.proto index 3aebde0..dba7260 100644 --- a/protos/LineNetTrainOffset.proto +++ b/protos/LineNetTrainOffset.proto @@ -10,14 +10,6 @@ message LineNetTrainOffset{ string Group_id = 2; //方向 int32 dir = 3; - // true-到达，false-出发 - // bool initType = 4; - //位置 - // int32 offset = 5; - //目的地id - // int32 destinationId = 6; - //后方车站 - // int32 backId = 7; //是否删除 bool show = 4; //车次窗编号