diff --git a/proto/src/model.proto b/proto/src/model.proto index 97ed325..b7fa03f 100644 --- a/proto/src/model.proto +++ b/proto/src/model.proto @@ -113,7 +113,7 @@ message Transponder { Kilometer km = 2; string sectionId = 3; //关联的区段 DevicePort turnoutPort = 4; //关联的区段端口 - string fixedTelegram = 5;//无源应答器固定报文 + bytes fixedTelegram = 5;//无源应答器固定报文 } //坡度 diff --git a/repository/model/proto/model.pb.go b/repository/model/proto/model.pb.go index cde87ee..07faa88 100644 --- a/repository/model/proto/model.pb.go +++ b/repository/model/proto/model.pb.go @@ -1333,7 +1333,7 @@ type Transponder struct { Km *Kilometer `protobuf:"bytes,2,opt,name=km,proto3" json:"km,omitempty"` SectionId string `protobuf:"bytes,3,opt,name=sectionId,proto3" json:"sectionId,omitempty"` //关联的区段 TurnoutPort *DevicePort `protobuf:"bytes,4,opt,name=turnoutPort,proto3" json:"turnoutPort,omitempty"` //关联的区段端口 - FixedTelegram string `protobuf:"bytes,5,opt,name=fixedTelegram,proto3" json:"fixedTelegram,omitempty"` //无源应答器固定报文 + FixedTelegram []byte `protobuf:"bytes,5,opt,name=fixedTelegram,proto3" json:"fixedTelegram,omitempty"` //无源应答器固定报文 } func (x *Transponder) Reset() { @@ -1396,11 +1396,11 @@ func (x *Transponder) GetTurnoutPort() *DevicePort { return nil } -func (x *Transponder) GetFixedTelegram() string { +func (x *Transponder) GetFixedTelegram() []byte { if x != nil { return x.FixedTelegram } - return "" + return nil } // 坡度 @@ -3172,7 +3172,7 @@ var file_model_proto_rawDesc = []byte{ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x50, 0x6f, 0x72, 0x74, 0x52, 0x0b, 0x74, 0x75, 0x72, 0x6e, 0x6f, 0x75, 0x74, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x66, 0x69, 0x78, 0x65, 0x64, 0x54, 0x65, 0x6c, - 0x65, 0x67, 0x72, 0x61, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x66, 0x69, 0x78, + 0x65, 0x67, 0x72, 0x61, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x66, 0x69, 0x78, 0x65, 0x64, 0x54, 0x65, 0x6c, 0x65, 0x67, 0x72, 0x61, 0x6d, 0x22, 0x53, 0x0a, 0x05, 0x53, 0x6c, 0x6f, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x22, 0x0a, 0x03, 0x6b, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, diff --git a/repository/transponder.go b/repository/transponder.go index e08f746..762b231 100644 --- a/repository/transponder.go +++ b/repository/transponder.go @@ -9,10 +9,10 @@ type Transponder struct { //section *PhysicalSection //turnoutPort TurnoutPort linkPosition *LinkPosition - fixedTelegram string //无源应答器固定报文 + fixedTelegram []byte //无源应答器固定报文 } -func NewTransponder(id string, km *proto.Kilometer, fixedTelegram string) *Transponder { +func NewTransponder(id string, km *proto.Kilometer, fixedTelegram []byte) *Transponder { return &Transponder{ Identity: identity{id, proto.DeviceType_DeviceType_Transponder}, km: km,