diff --git a/protos/device_state.proto b/protos/device_state.proto index bdffffc..4f61955 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"; //状态定义面向物理层即只定义物理状态,不定义逻辑层状态 @@ -452,7 +452,7 @@ message MkxJState { message BaliseState { uint32 id = 1; graphicData.KilometerSystem km = 2; //当前公里标 - bytes telegram = 3; //当前报文 + string telegram = 3; //当前报文(16进制字符串) } //////////////////////////////////////////////////////////////////////////// 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 87284d3..92e772f 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; @@ -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