From 2de479ce4bf563c50c06c9bff31fa20262e7c51c Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Tue, 19 Dec 2023 16:19:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E7=9A=84proto=20id=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_info.proto | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/protos/device_info.proto b/protos/device_info.proto index e2ec4d8..539afcc 100644 --- a/protos/device_info.proto +++ b/protos/device_info.proto @@ -7,16 +7,16 @@ option java_outer_classname = "DeviceInfoProto"; // 区段 message Section { - string id = 1; + uint32 id = 1; // 区段编码 string code = 2; // 关联区段 - repeated string childrenId = 3; + repeated uint32 childrenId = 3; // 物理区段Id - string physicalSectionId = 4; + uint32 physicalSectionId = 4; // 目的地码 string destinationCode = 5; @@ -28,7 +28,7 @@ message Section { // 道岔 message Turnout { - string id = 1; + uint32 id = 1; string code = 2; From 65b1b4628e56c59dff585733a53ed0197a7f9828 Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Wed, 20 Dec 2023 13:50:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/system_warn_message.proto | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 protos/system_warn_message.proto diff --git a/protos/system_warn_message.proto b/protos/system_warn_message.proto new file mode 100644 index 0000000..a668fe5 --- /dev/null +++ b/protos/system_warn_message.proto @@ -0,0 +1,11 @@ +syntax = "proto3"; + +package state; //模型的可变的状态数据 +//import "LineNetTrainOffsetDiagram.proto"; +option java_package = "club.joylink.xiannccda.dto.protos"; +option java_outer_classname = "SystemWarnMsgProto"; + +message WarnMessage { + bool occRealConned = 1; + bool occUnrealConned = 2; +} From 2b147a06d065df7743012cf63cfcbfee0ef3dcd4 Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Wed, 20 Dec 2023 14:19:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/system_warn_message.proto | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/protos/system_warn_message.proto b/protos/system_warn_message.proto index a668fe5..023135a 100644 --- a/protos/system_warn_message.proto +++ b/protos/system_warn_message.proto @@ -5,7 +5,12 @@ package state; //模型的可变的状态数据 option java_package = "club.joylink.xiannccda.dto.protos"; option java_outer_classname = "SystemWarnMsgProto"; -message WarnMessage { - bool occRealConned = 1; - bool occUnrealConned = 2; +message WarnLineMessage{ + repeated WarnMessage msgs = 1; +} + +message WarnMessage { + int32 lineId = 1; + bool occRealConned = 2; + bool occUnrealConned = 3; }