From 1a21f13ccef1c7b274b9b5b7d704dc3bfe8660a5 Mon Sep 17 00:00:00 2001 From: joylink_zhangsai <1021828630@qq.com> Date: Thu, 11 Jan 2024 10:24:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9proto=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=80=BB=E8=BE=91=EF=BC=9B=E4=BF=AE=E6=94=B9?= =?UTF-8?q?proto=E6=96=87=E4=BB=B6=E7=BC=96=E8=AF=91=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E5=B9=B6=E4=BF=AE=E6=94=B9=E5=85=B6=E5=AE=83=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=AF=B9=E7=94=9F=E6=88=90=E7=9A=84=E6=96=87=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_state.proto | 2 +- protos/ibpGraphics.proto | 2 +- protos/picture.proto | 2 +- protos/pslGraphics.proto | 2 +- protos/relayCabinetLayoutGraphics.proto | 2 +- protos/request.proto | 2 +- protos/stationLayoutGraphics.proto | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/protos/device_state.proto b/protos/device_state.proto index bdffffc..0b1ac5f 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -4,7 +4,7 @@ import "stationLayoutGraphics.proto"; package state; option java_package = "club.joylink.bjrtss.ats.verify.protos"; option java_outer_classname = "DeviceStateProto"; -option go_package = "./ts/protos/state"; +option go_package = "joylink.club/bj-rtsts-server/dto/state_proto"; //状态定义面向物理层即只定义物理状态，不定义逻辑层状态 diff --git a/protos/ibpGraphics.proto b/protos/ibpGraphics.proto index ec444f2..7d11550 100644 --- a/protos/ibpGraphics.proto +++ b/protos/ibpGraphics.proto @@ -1,7 +1,7 @@ syntax = "proto3"; import "stationLayoutGraphics.proto"; package ibpGraphicData; -option go_package = "./ts/protos/graphicData"; +option go_package = "joylink.club/bj-rtsts-server/dto/data_proto"; message IBPGraphicStorage { graphicData.Canvas canvas = 1; diff --git a/protos/picture.proto b/protos/picture.proto index 1c8a068..e2143ba 100644 --- a/protos/picture.proto +++ b/protos/picture.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = "./ts/protos/graphicData"; +option go_package = "joylink.club/bj-rtsts-server/dto/data_proto"; enum PictureType { /** 平面布置图 */ diff --git a/protos/pslGraphics.proto b/protos/pslGraphics.proto index 1b3a66d..bd0c0eb 100644 --- a/protos/pslGraphics.proto +++ b/protos/pslGraphics.proto @@ -2,7 +2,7 @@ syntax = "proto3"; import "stationLayoutGraphics.proto"; package pslGraphicData; -option go_package = "./ts/protos/graphicData"; +option go_package = "joylink.club/bj-rtsts-server/dto/data_proto"; message PslGraphicStorage { graphicData.Canvas canvas = 1; diff --git a/protos/relayCabinetLayoutGraphics.proto b/protos/relayCabinetLayoutGraphics.proto index c79f59c..9f5e266 100644 --- a/protos/relayCabinetLayoutGraphics.proto +++ b/protos/relayCabinetLayoutGraphics.proto @@ -2,7 +2,7 @@ syntax = "proto3"; import "stationLayoutGraphics.proto"; package relayCabinetGraphicData; -option go_package = "./ts/protos/graphicData"; +option go_package = "joylink.club/bj-rtsts-server/dto/data_proto"; message RelayCabinetGraphicStorage { graphicData.Canvas canvas = 1; diff --git a/protos/request.proto b/protos/request.proto index f0d07f3..b1290de 100644 --- a/protos/request.proto +++ b/protos/request.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package request; -option go_package = "./dto/request_proto"; +option go_package = "joylink.club/bj-rtsts-server/dto/request_proto"; // 继电器 message Relay { diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto index 2da68d8..f52f3b5 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package graphicData; option java_package = "club.joylink.bjrtss.ats.verify.protos"; option java_outer_classname = "LayoutGraphicsProto"; -option go_package = "./ts/protos/graphicData"; +option go_package = "joylink.club/bj-rtsts-server/dto/data_proto"; message RtssGraphicStorage { Canvas canvas = 1; From 69300cf11d9e494e2ab1115608269fd80dea4fa9 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Tue, 16 Jan 2024 13:07:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=A6=E7=AB=99?= =?UTF-8?q?=E6=8B=BC=E9=9F=B3=E7=AE=80=E5=86=99?= 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 f52f3b5..a34a0be 100644 --- a/protos/stationLayoutGraphics.proto +++ b/protos/stationLayoutGraphics.proto @@ -196,7 +196,7 @@ message Station { // int32 index = 7; string refIbpMapCode = 8; // 关联IBP地图Code string stationName = 9; //车站名 - //string stationNameAcronym = 10; // 车站名缩写 + string stationNameAcronym = 10; // 车站名拼音简写 bool depots = 11; //是否车辆段 repeated string oldmanageStations = 12; // 如果是集中站——管理的车站-id repeated uint32 manageStations = 13; // 如果是集中站——管理的车站-id From 411729dc6a357f8bab7df24d66ea93cb5ba77c0a Mon Sep 17 00:00:00 2001 From: joylink_zhangsai <1021828630@qq.com> Date: Tue, 16 Jan 2024 13:44:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=8E=E5=89=8D=E7=AB=AF=E4=BC=A0?= =?UTF-8?q?=E9=80=92=E7=9A=84=E5=BA=94=E7=AD=94=E5=99=A8=E6=8A=A5=E6=96=87?= =?UTF-8?q?=E6=94=B9=E4=B8=BA16=E8=BF=9B=E5=88=B6=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protos/device_state.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protos/device_state.proto b/protos/device_state.proto index 0b1ac5f..4f61955 100644 --- a/protos/device_state.proto +++ b/protos/device_state.proto @@ -452,7 +452,7 @@ message MkxJState { message BaliseState { uint32 id = 1; graphicData.KilometerSystem km = 2; //当前公里标 - bytes telegram = 3; //当前报文 + string telegram = 3; //当前报文（16进制字符串） } ////////////////////////////////////////////////////////////////////////////