From c1a99789fe12482085d30eaa66e0e881ffc99c00 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Wed, 12 Jul 2023 17:13:17 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8C=BA=E6=AE=B5?= =?UTF-8?q?=E8=B0=83=E6=95=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 557376f..4f3f6ee 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -257,4 +257,5 @@ message LogicSection { // 逻辑区段 repeated Point points = 3; string axleSectionId = 4; // 关联的计轴区段Id int32 indexNumber = 5; // 索引编号 + string turnoutId = 6; // 关联的岔芯对应的道岔id } From cfa4d5a3dc21c8dd5f539dd50e82a199dcde4e9f Mon Sep 17 00:00:00 2001 From: xzb <223@qq.com> Date: Thu, 13 Jul 2023 18:13:43 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BB=BF=E7=9C=9Fws=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_state.proto | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/protos/device_state.proto b/protos/device_state.proto index cafdf38..8d9df56 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -86,3 +86,14 @@ message AllDevicesStatus{ //所有类型区段状态 repeated SectionState sectionState = 3; } + +//服务器端向前端推送的设备状态信息 +message PushedDevicesStatus{ + //true-全量设备状态信息，此时allStatus有效； + //false - 增量设备状态消息，此时varStatus有效 + bool all = 1; + //增量设备状态消息 + VariationStatus varStatus = 2; + //全量设备状态信息 + AllDevicesStatus allStatus = 3; +} From f20227186acb3ccbe44e9a6bff8e0986fa64a4c0 Mon Sep 17 00:00:00 2001 From: xzb <223@qq.com> Date: Fri, 14 Jul 2023 13:09:45 +0800 Subject: [PATCH 3/6] mm --- protos/device_state.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protos/device_state.proto b/protos/device_state.proto index 8d9df56..83dcf46 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -52,11 +52,11 @@ message TrainState{ string id = 1; //车头所在link的索引 string headLinkId = 2; - //车头所在link内的偏移量，单位为cm + //车头所在link内的偏移量，单位为mm int64 headLinkOffset = 3; //车尾所在link的索引 string tailLinkId = 4; - //车尾所在link内的偏移量，单位为cm + //车尾所在link内的偏移量，单位为mm int64 tailLinkOffset = 5; //列车所占用的link的索引的列表 //顺序为从车头到车尾 From 9842e3e013c22ef54b4718d56425590d5ed92c15 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Fri, 14 Jul 2023 13:43:46 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 4f3f6ee..ff275a4 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -212,7 +212,7 @@ message RelatedRef { //与道岔的位置关系 message TurnoutPosRef { string id = 1; //道岔的ID - int32 position = 2; //道岔的正反为，0是正位，1是反位 + int32 position = 2; //道岔的正反为，0是定位，1是反位 } message Separator { // 分隔符 From 7899ff249807a0a939a5c383434b7fb1e93c01a3 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Fri, 14 Jul 2023 13:58:05 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index ff275a4..4607708 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -124,7 +124,7 @@ message AxleCounting { CommonInfo common = 1; string code = 2; KilometerSystem kilometerSystem = 3; //公里标 - repeated RelatedRef axleCountingRef = 4; // 关联的设备 + repeated RelatedRef axleCountingRef = 4; // 计轴关联的区段和道岔 int32 indexNumber = 5; //计轴的索引编号 } @@ -209,7 +209,7 @@ message RelatedRef { DevicePort devicePort = 3; //关联的设备端口 } -//与道岔的位置关系 +//计轴区段与道岔的位置关系 message TurnoutPosRef { string id = 1; //道岔的ID int32 position = 2; //道岔的正反为，0是定位，1是反位 @@ -245,10 +245,10 @@ message AxleCountingSection { // 计轴区段 CommonInfo common = 1; string code = 2; repeated Point points = 3; - RelatedRef paRef = 4; // 区段A端关联的设备 - RelatedRef pbRef = 5; // 区段B端关联的设备 - repeated TurnoutPosRef turnoutPos = 6; //关联道岔的正反位 - int32 indexNumber = 7; //区段的索引编号 + RelatedRef paRef = 4; // 计轴区段A端关联的计轴 + RelatedRef pbRef = 5; // 计轴区段B端关联的计轴 + repeated TurnoutPosRef turnoutPos = 6; //关联道岔的正反位--0是定位，1是反位 + int32 indexNumber = 7; //计轴区段的索引编号 } message LogicSection { // 逻辑区段 From a2be125b35918a5936541fe49155f5139640a8f3 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Fri, 14 Jul 2023 14:05:09 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 78 +++++++++++++++--------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 4607708..ca54bb9 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -6,16 +6,16 @@ option java_outer_classname = "LayoutGraphicsProto"; message RtssGraphicStorage { Canvas canvas = 1; - repeated Link links = 2; - repeated IscsFan iscsFans = 3; + // repeated Link links = 2; + // repeated IscsFan iscsFans = 3; repeated Platform Platforms = 4; repeated Station stations = 5; - repeated Rect rects = 6; - repeated Train train = 7; + // repeated Rect rects = 6; + // repeated Train train = 7; repeated Signal signals = 8; repeated Turnout turnouts = 9; repeated Section section = 10; - repeated Polygon polygons = 11; + // repeated Polygon polygons = 11; repeated TrainWindow trainWindows = 12; repeated AxleCounting axleCountings = 13; repeated Separator separators = 14; @@ -69,34 +69,34 @@ message CommonInfo { repeated ChildTransform childTransforms = 4; } -message Link { - CommonInfo common = 1; - string code = 2; - bool curve = 3; // 是否曲线 - int32 segmentsCount = 4; // 曲线分段数 - int32 lineWidth = 5; // 线宽 - string lineColor = 6; // 线色 - repeated Point points = 7; // 点坐标列表 -} +// message Link { +// CommonInfo common = 1; +// string code = 2; +// bool curve = 3; // 是否曲线 +// int32 segmentsCount = 4; // 曲线分段数 +// int32 lineWidth = 5; // 线宽 +// string lineColor = 6; // 线色 +// repeated Point points = 7; // 点坐标列表 +// } -message Rect { - CommonInfo common = 1; - string code = 2; - int32 lineWidth = 3; // 线宽 - string lineColor = 4; // 线色 - float width = 5; //宽度 - float height = 6; //高度 - int32 radius = 7; //圆角半径 - Point point = 8; // 画第一个点的坐标 -} +// message Rect { +// CommonInfo common = 1; +// string code = 2; +// int32 lineWidth = 3; // 线宽 +// string lineColor = 4; // 线色 +// float width = 5; //宽度 +// float height = 6; //高度 +// int32 radius = 7; //圆角半径 +// Point point = 8; // 画第一个点的坐标 +// } -message Polygon { - CommonInfo common = 1; - string code = 2; - int32 lineWidth = 3; // 线宽 - string lineColor = 4; // 线色 - repeated Point points = 5; // 点坐标列表 -} +// message Polygon { +// CommonInfo common = 1; +// string code = 2; +// int32 lineWidth = 3; // 线宽 +// string lineColor = 4; // 线色 +// repeated Point points = 5; // 点坐标列表 +// } message Platform { CommonInfo common = 1; @@ -128,15 +128,15 @@ message AxleCounting { int32 indexNumber = 5; //计轴的索引编号 } -message Train { - CommonInfo common = 1; - string code = 2; -} +// message Train { +// CommonInfo common = 1; +// string code = 2; +// } -message IscsFan { - CommonInfo common = 1; - string code = 2; -} +// message IscsFan { +// CommonInfo common = 1; +// string code = 2; +// } message Turnout { CommonInfo common = 1;