From be738fbf2d34715099189eba61e425a1b2229c3f Mon Sep 17 00:00:00 2001 From: weizhihong Date: Tue, 19 Sep 2023 10:49:06 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90=E4=BB=BF=E7=9C=9F=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=A2=9E=E5=8A=A0=E5=B1=9E=E6=80=A7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_state.proto | 2 ++ 1 file changed, 2 insertions(+) diff --git a/protos/device_state.proto b/protos/device_state.proto index fb3e08d..eb48e86 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -236,6 +236,8 @@ message SimulationStatus { int32 mapId = 2; int32 projectId = 3; + + repeated int32 mapIds = 4; } // 变更信息状态 From 473f7da13f142c51c774149002e5b8752b0e6825 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Wed, 20 Sep 2023 14:36:15 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E8=AE=A1=E8=BD=B4?= 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 f0a890f..8095ee6 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -147,7 +147,7 @@ message AxleCounting { repeated RelatedRef axleCountingRef = 4; // 计轴关联的非岔区物理区段和道岔，设备id和端口 int32 index = 5; //计轴的索引编号 - bool invent = 6; //是否虚拟计轴--一般是最末端 + //bool invent = 6; //是否虚拟计轴--一般是最末端 TypeDetectionPoint type = 7; //检测点的类型：计轴、区段边界 } From 90cdd389e5be1b71b3c35f62e02d732a0913b867 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Wed, 20 Sep 2023 15:31:56 +0800 Subject: [PATCH 3/5] =?UTF-8?q?uniqueId=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/relayCabinetLayoutGraphics.proto | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/protos/relayCabinetLayoutGraphics.proto b/protos/relayCabinetLayoutGraphics.proto index 8fa9f9a..dda8785 100644 --- a/protos/relayCabinetLayoutGraphics.proto +++ b/protos/relayCabinetLayoutGraphics.proto @@ -9,7 +9,8 @@ message RelayCabinetGraphicStorage { repeated RelayCabinet relayCabinets = 2; repeated Relay relays = 3; repeated DeviceRelateRelay deviceRelateRelayList = 4; - string belongsConcentrationStation = 5;//继电器柜图所属集中站 + //string belongsConcentrationStation = 5;//继电器柜图所属集中站 + UniqueIdType UniqueIdPrefix = 6;//设备唯一编码--前缀 } message RelayCabinet { @@ -31,7 +32,13 @@ message DeviceRelateRelay { //repeated string refRelay = 4;//设备关联的继电器 repeated Combinationtype combinationtypes = 5; //组合类型 } -message Combinationtype{ +message Combinationtype { string code = 1; repeated string refRelays = 2;//设备关联的继电器 } + +message UniqueIdType { + string city = 1;//城市 + string lineId = 2;//线路号 + string belongsConcentrationStation = 3;//继电器柜图所属集中站 +} From 62dfd5b37d8f402052e714808b332b600c363f0d Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Thu, 21 Sep 2023 09:09:07 +0800 Subject: [PATCH 4/5] =?UTF-8?q?uniqueId=E4=BF=A1=E5=8F=B7=E5=B8=83?= =?UTF-8?q?=E7=BD=AE=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 8095ee6..48dd557 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -35,6 +35,7 @@ message RtssGraphicStorage { repeated Curvature curvatures = 27; // 曲度 repeated TrackSection trackSections = 28; //轨道区段 repeated TrackLogicSection trackLogicSections = 29; //轨道逻辑区段 + UniqueIdType UniqueIdPrefix = 30;//设备唯一编码--前缀 } message Canvas { @@ -422,3 +423,8 @@ message CalculateLink { string deviceType = 3; } } + +message UniqueIdType { + string city = 1;//城市 + string lineId = 2;//线路号 +} From db19234f9e4d3fb92b0a7dbd9ab1e5c1b38677ad Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Thu, 21 Sep 2023 11:03:35 +0800 Subject: [PATCH 5/5] =?UTF-8?q?uniqueId=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/stationLayoutGraphics.proto | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 48dd557..7bb08e0 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -35,7 +35,8 @@ message RtssGraphicStorage { repeated Curvature curvatures = 27; // 曲度 repeated TrackSection trackSections = 28; //轨道区段 repeated TrackLogicSection trackLogicSections = 29; //轨道逻辑区段 - UniqueIdType UniqueIdPrefix = 30;//设备唯一编码--前缀 + //UniqueIdType UniqueIdPrefix = 30;//设备唯一编码--前缀 + UniqueIdOfStationLayout UniqueIdPrefix = 31;//设备唯一编码--前缀 } message Canvas { @@ -424,7 +425,7 @@ message CalculateLink { } } -message UniqueIdType { +message UniqueIdOfStationLayout { string city = 1;//城市 string lineId = 2;//线路号 }