From 2d20cfbf453dfedb389411d82bd0608bddcad26c Mon Sep 17 00:00:00 2001 From: joylink_zhangsai <1021828630@qq.com> Date: Wed, 20 Sep 2023 15:14:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=AD=98=E5=82=A8Proto?= =?UTF-8?q?=E7=9A=84Message=EF=BC=9B=E5=88=9B=E5=BB=BA=E4=BB=BF=E7=9C=9F?= =?UTF-8?q?=E6=97=B6=E7=94=B1=E4=BB=BF=E7=9C=9F=E6=A8=A1=E5=9D=97=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=A8=A1=E5=9E=8B=EF=BC=9B=E5=8F=91=E7=BB=99=E5=8A=A8?= =?UTF-8?q?=E5=8A=9B=E5=AD=A6=E7=9A=84=E6=95=B0=E6=8D=AE=E4=BB=8E=E4=BB=BF?= =?UTF-8?q?=E7=9C=9F=E6=A8=A1=E5=9D=97=E8=BF=94=E5=9B=9E=E7=9A=84Repositor?= =?UTF-8?q?y=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ats/calculate/calculate.go | 163 ------ ats/verify/protos/graphicData/picture.pb.go | 2 +- .../protos/graphicData/pslGraphics.pb.go | 2 +- .../relayCabinetLayoutGraphics.pb.go | 526 ++++++++++++++++++ .../graphicData/stationLayoutGraphics.pb.go | 2 +- ats/verify/protos/state/device_state.pb.go | 2 +- ats/verify/simulation/simulation_manage.go | 300 ++++++---- .../wayside/memory/wayside_memory.go | 12 +- .../wayside/memory/wayside_memory_map.go | 413 +++++++++----- .../wayside/memory/wayside_simulation.go | 301 +++++++++- bj-rtss-message | 2 +- go.mod | 2 +- go.sum | 3 +- go.work.sum | 9 + protobuf/file.bin | Bin 0 -> 95419 bytes protobuf/main_test.go | 28 +- 16 files changed, 1338 insertions(+), 429 deletions(-) delete mode 100644 ats/calculate/calculate.go create mode 100644 ats/verify/protos/graphicData/relayCabinetLayoutGraphics.pb.go create mode 100644 protobuf/file.bin diff --git a/ats/calculate/calculate.go b/ats/calculate/calculate.go deleted file mode 100644 index 55be2e0..0000000 --- a/ats/calculate/calculate.go +++ /dev/null @@ -1,163 +0,0 @@ -package calculate - -import ( - "errors" - "fmt" - "math" - "strconv" - - "joylink.club/bj-rtsts-server/ats/verify/simulation/wayside/face" - "joylink.club/bj-rtsts-server/ats/verify/simulation/wayside/memory" - "joylink.club/bj-rtsts-server/ats/verify/simulation/wayside/model/device" - "joylink.club/bj-rtsts-server/ats/verify/simulation/wayside/model/ref" -) - -// CalculateLinkPositionAndDirection 根据起始link位置、偏移量、偏移方向，计算偏移后的位置及方向。偏移方向上的剩余距离不够，会返回error -func CalculateLinkPositionAndDirection(simulation *memory.VerifySimulation, linkIndex int32, linkOffset int32, up bool, - offset int32) (int32, int32, bool, error) { - vs := memory.QueryMapVerifyStructure(simulation.MapId) - - direction := "下" - if up { - direction = "上" - } - - var tempOffset int32 - if up { - tempOffset = linkOffset + offset - linkModel := vs.LinkModelMap[linkIndex] - if tempOffset <= linkModel.Length { - return linkIndex, tempOffset, up, nil - } - if linkModel.BRelatedSwitchRef == nil { - return linkIndex, 0, up, errors.New(fmt.Sprintf("link位置[%d-%d]向[%s]偏移[%d]超出极限", linkIndex, linkOffset, direction, offset)) - } - turnoutState := memory.GetTurnoutState(simulation, linkModel.ARelatedSwitchRef.SwitchDevice.GetIndex()) - turnoutModel := linkModel.ARelatedSwitchRef.SwitchDevice.(*device.SwitchDeviceModel) - var linkPort *ref.DevicePort[*device.LinkModel] - if turnoutState.Normal { - switch linkModel.BRelatedSwitchRef.Port { - case face.A: - linkPort = turnoutModel.BLinkPort - case face.B: - linkPort = turnoutModel.ALinkPort - } - } else if turnoutState.Reverse { - switch linkModel.BRelatedSwitchRef.Port { - case face.A: - linkPort = turnoutModel.CLinkPort - case face.C: - linkPort = turnoutModel.ALinkPort - } - } - if linkPort != nil { - var newOffset int32 - var newUp bool - i, _ := strconv.Atoi(linkPort.Device.Index) - switch linkPort.Port { - case face.A: - newOffset = 0 - newUp = true - case face.B: - newOffset = linkPort.Device.Length - newUp = false - } - return CalculateLinkPositionAndDirection(simulation, int32(i), newOffset, newUp, tempOffset-linkModel.Length) - } else { - return linkIndex, 0, up, errors.New(fmt.Sprintf("link位置[%d-%d]向[%s]偏移[%d]超出极限", linkIndex, linkOffset, direction, offset)) - } - } else { - tempOffset = linkOffset - offset - if tempOffset >= 0 { - return linkIndex, tempOffset, up, nil - } - linkModel := vs.LinkModelMap[linkIndex] - if linkModel.ARelatedSwitchRef == nil { - return linkIndex, 0, up, errors.New(fmt.Sprintf("link位置[%d-%d]向[%s]偏移[%d]超出极限", linkIndex, linkOffset, direction, offset)) - } - turnoutState := memory.GetTurnoutState(simulation, linkModel.ARelatedSwitchRef.SwitchDevice.GetIndex()) - turnoutModel := linkModel.ARelatedSwitchRef.SwitchDevice.(*device.SwitchDeviceModel) - var linkPort *ref.DevicePort[*device.LinkModel] - if turnoutState.Normal { - switch linkModel.ARelatedSwitchRef.Port { - case face.A: - linkPort = turnoutModel.BLinkPort - case face.B: - linkPort = turnoutModel.ALinkPort - } - } else if turnoutState.Reverse { - switch linkModel.ARelatedSwitchRef.Port { - case face.A: - linkPort = turnoutModel.CLinkPort - case face.C: - linkPort = turnoutModel.ALinkPort - } - } - if linkPort != nil { - var newOffset int32 - var newUp bool - i, _ := strconv.Atoi(linkPort.Device.Index) - switch linkPort.Port { - case face.A: - newOffset = 0 - newUp = true - case face.B: - newOffset = linkPort.Device.Length - newUp = false - } - return CalculateLinkPositionAndDirection(simulation, int32(i), newOffset, newUp, int32(math.Abs(float64(tempOffset)))) - } else { - return linkIndex, 0, up, errors.New(fmt.Sprintf("link位置[%d-%d]向[%s]偏移[%d]超出极限", linkIndex, linkOffset, direction, offset)) - } - } -} - -// CalculateLen 计算两个link位置的间距 -// @param up 优先向这个方向查找终点 -func CalculateLen(start *ref.DevicePosition[*device.LinkModel], end *ref.DevicePosition[*device.LinkModel], up bool) (int, error) { - return calculateLen(start, end, up, 0) -} - -//// CalculateDirection 计算以{link}为基准的dp方向 -//// @param up 优先向这个方向查找link -//func CalculateDirection(dp *ref.DevicePort[*device.LinkModel], link *device.LinkModel, up bool) *ref.DevicePort[*device.LinkModel] { -// if link == dp.Device { -// return dp -// } -// -//} - -func calculateLen(start *ref.DevicePosition[*device.LinkModel], end *ref.DevicePosition[*device.LinkModel], - up bool, l int) (int, error) { - if start.Device == end.Device { - return l + int(math.Abs(float64(start.Offset-end.Offset))), nil - } - - var turnoutPort *ref.SwitchRef - if up { - l += int(start.Device.Length - start.Offset) - turnoutPort = start.Device.BRelatedSwitchRef - } else { - l += int(start.Offset) - turnoutPort = start.Device.ARelatedSwitchRef - } - var lps []*ref.DevicePosition[*device.LinkModel] - if turnoutPort != nil { - turnoutModel := start.Device.BRelatedSwitchRef.SwitchDevice.(*device.SwitchDeviceModel) - device.ConvertFromDevicePort(turnoutModel.BLinkPort) - switch turnoutPort.Port { - case face.A: - lps = append(lps, device.ConvertFromDevicePort(turnoutModel.BLinkPort)) - lps = append(lps, device.ConvertFromDevicePort(turnoutModel.CLinkPort)) - case face.B | face.C: - lps = append(lps, device.ConvertFromDevicePort(turnoutModel.ALinkPort)) - } - } - for _, lp := range lps { - i, err := calculateLen(lp, end, lp.Offset == 0, l) - if err == nil { - return i, nil - } - } - return 0, errors.New(fmt.Sprintf("从[%s]到[%s]的间距无法计算", start.String(), end.String())) -} diff --git a/ats/verify/protos/graphicData/picture.pb.go b/ats/verify/protos/graphicData/picture.pb.go index 2fe8d05..1568b2e 100644 --- a/ats/verify/protos/graphicData/picture.pb.go +++ b/ats/verify/protos/graphicData/picture.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.31.0 // protoc v4.23.1 // source: picture.proto diff --git a/ats/verify/protos/graphicData/pslGraphics.pb.go b/ats/verify/protos/graphicData/pslGraphics.pb.go index a92c07d..1d001fa 100644 --- a/ats/verify/protos/graphicData/pslGraphics.pb.go +++ b/ats/verify/protos/graphicData/pslGraphics.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.31.0 // protoc v4.23.1 // source: pslGraphics.proto diff --git a/ats/verify/protos/graphicData/relayCabinetLayoutGraphics.pb.go b/ats/verify/protos/graphicData/relayCabinetLayoutGraphics.pb.go new file mode 100644 index 0000000..1a330af --- /dev/null +++ b/ats/verify/protos/graphicData/relayCabinetLayoutGraphics.pb.go @@ -0,0 +1,526 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.31.0 +// protoc v4.23.1 +// source: relayCabinetLayoutGraphics.proto + +package graphicData + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type RelayCabinetGraphicStorage struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Canvas *Canvas `protobuf:"bytes,1,opt,name=canvas,proto3" json:"canvas,omitempty"` + RelayCabinets []*RelayCabinet `protobuf:"bytes,2,rep,name=relayCabinets,proto3" json:"relayCabinets,omitempty"` + Relays []*Relay `protobuf:"bytes,3,rep,name=relays,proto3" json:"relays,omitempty"` + DeviceRelateRelayList []*DeviceRelateRelay `protobuf:"bytes,4,rep,name=deviceRelateRelayList,proto3" json:"deviceRelateRelayList,omitempty"` + BelongsConcentrationStation string `protobuf:"bytes,5,opt,name=belongsConcentrationStation,proto3" json:"belongsConcentrationStation,omitempty"` //继电器柜图所属集中站 +} + +func (x *RelayCabinetGraphicStorage) Reset() { + *x = RelayCabinetGraphicStorage{} + if protoimpl.UnsafeEnabled { + mi := &file_relayCabinetLayoutGraphics_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *RelayCabinetGraphicStorage) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*RelayCabinetGraphicStorage) ProtoMessage() {} + +func (x *RelayCabinetGraphicStorage) ProtoReflect() protoreflect.Message { + mi := &file_relayCabinetLayoutGraphics_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use RelayCabinetGraphicStorage.ProtoReflect.Descriptor instead. +func (*RelayCabinetGraphicStorage) Descriptor() ([]byte, []int) { + return file_relayCabinetLayoutGraphics_proto_rawDescGZIP(), []int{0} +} + +func (x *RelayCabinetGraphicStorage) GetCanvas() *Canvas { + if x != nil { + return x.Canvas + } + return nil +} + +func (x *RelayCabinetGraphicStorage) GetRelayCabinets() []*RelayCabinet { + if x != nil { + return x.RelayCabinets + } + return nil +} + +func (x *RelayCabinetGraphicStorage) GetRelays() []*Relay { + if x != nil { + return x.Relays + } + return nil +} + +func (x *RelayCabinetGraphicStorage) GetDeviceRelateRelayList() []*DeviceRelateRelay { + if x != nil { + return x.DeviceRelateRelayList + } + return nil +} + +func (x *RelayCabinetGraphicStorage) GetBelongsConcentrationStation() string { + if x != nil { + return x.BelongsConcentrationStation + } + return "" +} + +type RelayCabinet struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Common *CommonInfo `protobuf:"bytes,1,opt,name=common,proto3" json:"common,omitempty"` + Code string `protobuf:"bytes,2,opt,name=code,proto3" json:"code,omitempty"` //编号 +} + +func (x *RelayCabinet) Reset() { + *x = RelayCabinet{} + if protoimpl.UnsafeEnabled { + mi := &file_relayCabinetLayoutGraphics_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *RelayCabinet) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*RelayCabinet) ProtoMessage() {} + +func (x *RelayCabinet) ProtoReflect() protoreflect.Message { + mi := &file_relayCabinetLayoutGraphics_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use RelayCabinet.ProtoReflect.Descriptor instead. +func (*RelayCabinet) Descriptor() ([]byte, []int) { + return file_relayCabinetLayoutGraphics_proto_rawDescGZIP(), []int{1} +} + +func (x *RelayCabinet) GetCommon() *CommonInfo { + if x != nil { + return x.Common + } + return nil +} + +func (x *RelayCabinet) GetCode() string { + if x != nil { + return x.Code + } + return "" +} + +type Relay struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Common *CommonInfo `protobuf:"bytes,1,opt,name=common,proto3" json:"common,omitempty"` + Code string `protobuf:"bytes,2,opt,name=code,proto3" json:"code,omitempty"` //编号 + Model string `protobuf:"bytes,3,opt,name=model,proto3" json:"model,omitempty"` //型号 +} + +func (x *Relay) Reset() { + *x = Relay{} + if protoimpl.UnsafeEnabled { + mi := &file_relayCabinetLayoutGraphics_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Relay) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Relay) ProtoMessage() {} + +func (x *Relay) ProtoReflect() protoreflect.Message { + mi := &file_relayCabinetLayoutGraphics_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Relay.ProtoReflect.Descriptor instead. +func (*Relay) Descriptor() ([]byte, []int) { + return file_relayCabinetLayoutGraphics_proto_rawDescGZIP(), []int{2} +} + +func (x *Relay) GetCommon() *CommonInfo { + if x != nil { + return x.Common + } + return nil +} + +func (x *Relay) GetCode() string { + if x != nil { + return x.Code + } + return "" +} + +func (x *Relay) GetModel() string { + if x != nil { + return x.Model + } + return "" +} + +// 设备管理的继电器列表 +type DeviceRelateRelay struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // int32 id = 1;//存储在列表中的id + Type string `protobuf:"bytes,2,opt,name=type,proto3" json:"type,omitempty"` //设备类型 + Code string `protobuf:"bytes,3,opt,name=code,proto3" json:"code,omitempty"` //设备编号 + // repeated string refRelay = 4;//设备关联的继电器 + Combinationtypes []*Combinationtype `protobuf:"bytes,5,rep,name=combinationtypes,proto3" json:"combinationtypes,omitempty"` //组合类型 +} + +func (x *DeviceRelateRelay) Reset() { + *x = DeviceRelateRelay{} + if protoimpl.UnsafeEnabled { + mi := &file_relayCabinetLayoutGraphics_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DeviceRelateRelay) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DeviceRelateRelay) ProtoMessage() {} + +func (x *DeviceRelateRelay) ProtoReflect() protoreflect.Message { + mi := &file_relayCabinetLayoutGraphics_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DeviceRelateRelay.ProtoReflect.Descriptor instead. +func (*DeviceRelateRelay) Descriptor() ([]byte, []int) { + return file_relayCabinetLayoutGraphics_proto_rawDescGZIP(), []int{3} +} + +func (x *DeviceRelateRelay) GetType() string { + if x != nil { + return x.Type + } + return "" +} + +func (x *DeviceRelateRelay) GetCode() string { + if x != nil { + return x.Code + } + return "" +} + +func (x *DeviceRelateRelay) GetCombinationtypes() []*Combinationtype { + if x != nil { + return x.Combinationtypes + } + return nil +} + +type Combinationtype struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Code string `protobuf:"bytes,1,opt,name=code,proto3" json:"code,omitempty"` + RefRelays []string `protobuf:"bytes,2,rep,name=refRelays,proto3" json:"refRelays,omitempty"` //设备关联的继电器 +} + +func (x *Combinationtype) Reset() { + *x = Combinationtype{} + if protoimpl.UnsafeEnabled { + mi := &file_relayCabinetLayoutGraphics_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Combinationtype) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Combinationtype) ProtoMessage() {} + +func (x *Combinationtype) ProtoReflect() protoreflect.Message { + mi := &file_relayCabinetLayoutGraphics_proto_msgTypes[4] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Combinationtype.ProtoReflect.Descriptor instead. +func (*Combinationtype) Descriptor() ([]byte, []int) { + return file_relayCabinetLayoutGraphics_proto_rawDescGZIP(), []int{4} +} + +func (x *Combinationtype) GetCode() string { + if x != nil { + return x.Code + } + return "" +} + +func (x *Combinationtype) GetRefRelays() []string { + if x != nil { + return x.RefRelays + } + return nil +} + +var File_relayCabinetLayoutGraphics_proto protoreflect.FileDescriptor + +var file_relayCabinetLayoutGraphics_proto_rawDesc = []byte{ + 0x0a, 0x20, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x43, 0x61, 0x62, 0x69, 0x6e, 0x65, 0x74, 0x4c, 0x61, + 0x79, 0x6f, 0x75, 0x74, 0x47, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x12, 0x17, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x43, 0x61, 0x62, 0x69, 0x6e, 0x65, 0x74, + 0x47, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x1a, 0x1b, 0x73, 0x74, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x61, 0x79, 0x6f, 0x75, 0x74, 0x47, 0x72, 0x61, 0x70, 0x68, 0x69, + 0x63, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf2, 0x02, 0x0a, 0x1a, 0x52, 0x65, 0x6c, + 0x61, 0x79, 0x43, 0x61, 0x62, 0x69, 0x6e, 0x65, 0x74, 0x47, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, + 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x12, 0x2b, 0x0a, 0x06, 0x63, 0x61, 0x6e, 0x76, 0x61, + 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, + 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x52, 0x06, 0x63, 0x61, + 0x6e, 0x76, 0x61, 0x73, 0x12, 0x4b, 0x0a, 0x0d, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x43, 0x61, 0x62, + 0x69, 0x6e, 0x65, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x72, 0x65, + 0x6c, 0x61, 0x79, 0x43, 0x61, 0x62, 0x69, 0x6e, 0x65, 0x74, 0x47, 0x72, 0x61, 0x70, 0x68, 0x69, + 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x52, 0x65, 0x6c, 0x61, 0x79, 0x43, 0x61, 0x62, 0x69, 0x6e, + 0x65, 0x74, 0x52, 0x0d, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x43, 0x61, 0x62, 0x69, 0x6e, 0x65, 0x74, + 0x73, 0x12, 0x36, 0x0a, 0x06, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x1e, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x43, 0x61, 0x62, 0x69, 0x6e, 0x65, 0x74, + 0x47, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x52, 0x65, 0x6c, 0x61, + 0x79, 0x52, 0x06, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x73, 0x12, 0x60, 0x0a, 0x15, 0x64, 0x65, 0x76, + 0x69, 0x63, 0x65, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x6c, 0x61, 0x79, 0x4c, 0x69, + 0x73, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x79, + 0x43, 0x61, 0x62, 0x69, 0x6e, 0x65, 0x74, 0x47, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, + 0x74, 0x61, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x65, 0x52, + 0x65, 0x6c, 0x61, 0x79, 0x52, 0x15, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x6c, 0x61, + 0x74, 0x65, 0x52, 0x65, 0x6c, 0x61, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x40, 0x0a, 0x1b, 0x62, + 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x73, 0x43, 0x6f, 0x6e, 0x63, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x1b, 0x62, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x73, 0x43, 0x6f, 0x6e, 0x63, 0x65, 0x6e, 0x74, + 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x53, 0x0a, + 0x0c, 0x52, 0x65, 0x6c, 0x61, 0x79, 0x43, 0x61, 0x62, 0x69, 0x6e, 0x65, 0x74, 0x12, 0x2f, 0x0a, + 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, + 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, + 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x12, 0x12, + 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, + 0x64, 0x65, 0x22, 0x62, 0x0a, 0x05, 0x52, 0x65, 0x6c, 0x61, 0x79, 0x12, 0x2f, 0x0a, 0x06, 0x63, + 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72, + 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, + 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, + 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, + 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x05, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x91, 0x01, 0x0a, 0x11, 0x44, 0x65, 0x76, 0x69, 0x63, + 0x65, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x65, 0x52, 0x65, 0x6c, 0x61, 0x79, 0x12, 0x12, 0x0a, 0x04, + 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, + 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, + 0x63, 0x6f, 0x64, 0x65, 0x12, 0x54, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x62, 0x69, 0x6e, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28, + 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x43, 0x61, 0x62, 0x69, 0x6e, 0x65, 0x74, 0x47, 0x72, 0x61, + 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6d, 0x62, 0x69, 0x6e, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x74, 0x79, 0x70, 0x65, 0x52, 0x10, 0x63, 0x6f, 0x6d, 0x62, 0x69, 0x6e, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x22, 0x43, 0x0a, 0x0f, 0x43, 0x6f, + 0x6d, 0x62, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, + 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, + 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x66, 0x52, 0x65, 0x6c, 0x61, 0x79, 0x73, 0x18, 0x02, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x66, 0x52, 0x65, 0x6c, 0x61, 0x79, 0x73, 0x42, + 0x21, 0x5a, 0x1f, 0x2e, 0x2f, 0x61, 0x74, 0x73, 0x2f, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x2f, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, + 0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_relayCabinetLayoutGraphics_proto_rawDescOnce sync.Once + file_relayCabinetLayoutGraphics_proto_rawDescData = file_relayCabinetLayoutGraphics_proto_rawDesc +) + +func file_relayCabinetLayoutGraphics_proto_rawDescGZIP() []byte { + file_relayCabinetLayoutGraphics_proto_rawDescOnce.Do(func() { + file_relayCabinetLayoutGraphics_proto_rawDescData = protoimpl.X.CompressGZIP(file_relayCabinetLayoutGraphics_proto_rawDescData) + }) + return file_relayCabinetLayoutGraphics_proto_rawDescData +} + +var file_relayCabinetLayoutGraphics_proto_msgTypes = make([]protoimpl.MessageInfo, 5) +var file_relayCabinetLayoutGraphics_proto_goTypes = []interface{}{ + (*RelayCabinetGraphicStorage)(nil), // 0: relayCabinetGraphicData.RelayCabinetGraphicStorage + (*RelayCabinet)(nil), // 1: relayCabinetGraphicData.RelayCabinet + (*Relay)(nil), // 2: relayCabinetGraphicData.Relay + (*DeviceRelateRelay)(nil), // 3: relayCabinetGraphicData.DeviceRelateRelay + (*Combinationtype)(nil), // 4: relayCabinetGraphicData.Combinationtype + (*Canvas)(nil), // 5: graphicData.Canvas + (*CommonInfo)(nil), // 6: graphicData.CommonInfo +} +var file_relayCabinetLayoutGraphics_proto_depIdxs = []int32{ + 5, // 0: relayCabinetGraphicData.RelayCabinetGraphicStorage.canvas:type_name -> graphicData.Canvas + 1, // 1: relayCabinetGraphicData.RelayCabinetGraphicStorage.relayCabinets:type_name -> relayCabinetGraphicData.RelayCabinet + 2, // 2: relayCabinetGraphicData.RelayCabinetGraphicStorage.relays:type_name -> relayCabinetGraphicData.Relay + 3, // 3: relayCabinetGraphicData.RelayCabinetGraphicStorage.deviceRelateRelayList:type_name -> relayCabinetGraphicData.DeviceRelateRelay + 6, // 4: relayCabinetGraphicData.RelayCabinet.common:type_name -> graphicData.CommonInfo + 6, // 5: relayCabinetGraphicData.Relay.common:type_name -> graphicData.CommonInfo + 4, // 6: relayCabinetGraphicData.DeviceRelateRelay.combinationtypes:type_name -> relayCabinetGraphicData.Combinationtype + 7, // [7:7] is the sub-list for method output_type + 7, // [7:7] is the sub-list for method input_type + 7, // [7:7] is the sub-list for extension type_name + 7, // [7:7] is the sub-list for extension extendee + 0, // [0:7] is the sub-list for field type_name +} + +func init() { file_relayCabinetLayoutGraphics_proto_init() } +func file_relayCabinetLayoutGraphics_proto_init() { + if File_relayCabinetLayoutGraphics_proto != nil { + return + } + file_stationLayoutGraphics_proto_init() + if !protoimpl.UnsafeEnabled { + file_relayCabinetLayoutGraphics_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*RelayCabinetGraphicStorage); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_relayCabinetLayoutGraphics_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*RelayCabinet); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_relayCabinetLayoutGraphics_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Relay); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_relayCabinetLayoutGraphics_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DeviceRelateRelay); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_relayCabinetLayoutGraphics_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Combinationtype); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_relayCabinetLayoutGraphics_proto_rawDesc, + NumEnums: 0, + NumMessages: 5, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_relayCabinetLayoutGraphics_proto_goTypes, + DependencyIndexes: file_relayCabinetLayoutGraphics_proto_depIdxs, + MessageInfos: file_relayCabinetLayoutGraphics_proto_msgTypes, + }.Build() + File_relayCabinetLayoutGraphics_proto = out.File + file_relayCabinetLayoutGraphics_proto_rawDesc = nil + file_relayCabinetLayoutGraphics_proto_goTypes = nil + file_relayCabinetLayoutGraphics_proto_depIdxs = nil +} diff --git a/ats/verify/protos/graphicData/stationLayoutGraphics.pb.go b/ats/verify/protos/graphicData/stationLayoutGraphics.pb.go index d1f4568..db0a4aa 100644 --- a/ats/verify/protos/graphicData/stationLayoutGraphics.pb.go +++ b/ats/verify/protos/graphicData/stationLayoutGraphics.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.31.0 // protoc v4.23.1 // source: stationLayoutGraphics.proto diff --git a/ats/verify/protos/state/device_state.pb.go b/ats/verify/protos/state/device_state.pb.go index 68e3bd1..b90e05d 100644 --- a/ats/verify/protos/state/device_state.pb.go +++ b/ats/verify/protos/state/device_state.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.31.0 // protoc v4.23.1 // source: device_state.proto diff --git a/ats/verify/simulation/simulation_manage.go b/ats/verify/simulation/simulation_manage.go index ed16add..ca34445 100644 --- a/ats/verify/simulation/simulation_manage.go +++ b/ats/verify/simulation/simulation_manage.go @@ -3,6 +3,8 @@ package simulation import ( "encoding/binary" "encoding/hex" + "joylink.club/rtsssimulation/repository" + "joylink.club/rtsssimulation/repository/model/proto" "math" "time" @@ -88,24 +90,47 @@ func CreateSimulation(projectId int32, mapIds []int32) string { panic(dto.ErrorDto{Code: dto.DataAlreadyExist, Message: "已有仿真在运行"}) } if !e { - verifySimulation := memory.CreateSimulation(projectId, mapIds) - verifySimulation.SimulationId = simulationId - lineDataInfo := &dynamics.LineBaseInfo{} - for _, mapId := range mapIds { - b := buildLineBaseInfo(memory.QueryMapVerifyStructure(mapId)) - lineDataInfo.CurveList = append(lineDataInfo.CurveList, b.CurveList...) - lineDataInfo.LinkList = append(lineDataInfo.LinkList, b.LinkList...) - lineDataInfo.SlopeList = append(lineDataInfo.SlopeList, b.SlopeList...) + verifySimulation, err := memory.CreateSimulation(projectId, mapIds) + if err != nil { + panic(fmt.Sprintf("创建仿真失败:%s", err.Error())) } + verifySimulation.SimulationId = simulationId //通知动力学 - httpCode, _, err := dynamics.SendSimulationStartReq(lineDataInfo) + lineBaseInfo := buildLineBaseInfo(verifySimulation.Repo) + httpCode, _, err := dynamics.SendSimulationStartReq(lineBaseInfo) if httpCode != http.StatusOK || err != nil { panic(dto.ErrorDto{Code: dto.DynamicsError, Message: fmt.Sprintf("动力学接口调用失败：[%d][%s]", httpCode, err)}) } + simulationMap.Store(simulationId, verifySimulation) dynamicsRun(verifySimulation) } return simulationId + + //simulationId := createSimulationId(projectId) + //_, e := simulationMap.Load(simulationId) + //if !e && IsExistSimulation() { + // panic(dto.ErrorDto{Code: dto.DataAlreadyExist, Message: "已有仿真在运行"}) + //} + //if !e { + // verifySimulation := memory.CreateSimulation(projectId, mapIds) + // verifySimulation.SimulationId = simulationId + // lineDataInfo := &dynamics.LineBaseInfo{} + // for _, mapId := range mapIds { + // b := buildLineBaseInfo(memory.QueryMapVerifyStructure(mapId)) + // lineDataInfo.CurveList = append(lineDataInfo.CurveList, b.CurveList...) + // lineDataInfo.LinkList = append(lineDataInfo.LinkList, b.LinkList...) + // lineDataInfo.SlopeList = append(lineDataInfo.SlopeList, b.SlopeList...) + // } + // //通知动力学 + // httpCode, _, err := dynamics.SendSimulationStartReq(lineDataInfo) + // if httpCode != http.StatusOK || err != nil { + // panic(dto.ErrorDto{Code: dto.DynamicsError, Message: fmt.Sprintf("动力学接口调用失败：[%d][%s]", httpCode, err)}) + // } + // simulationMap.Store(simulationId, verifySimulation) + // dynamicsRun(verifySimulation) + //} + //return simulationId } // 删除仿真对象 @@ -161,55 +186,55 @@ func GetSimulationArr() []*memory.VerifySimulation { } func convert(info *dynamics.TrainInfo, sta *state.TrainState, simulation *memory.VerifySimulation) *state.TrainState { - var vs *memory.VerifyStructure - linkId := int32(info.Link) - for _, mapId := range simulation.MapIds { - vm := memory.QueryMapVerifyStructure(mapId) - if vm.LinkModelMap[linkId] == nil { - continue - } - vs = vm - break - } - zap.S().Debugf("原始消息：[%d-%d-%d]", info.Number, info.Link, info.LinkOffset) - id, port, offset, runDirection, pointTo, kilometer := memory.QueryDeviceByCalcLink(vs, linkId, int64(info.LinkOffset), info.Up, sta.RunDirection) - zap.S().Debugf("转换后的消息：[%d-车头:%s-偏移:%d-上行:%v-是否ab:%v]", info.Number, id, offset, runDirection, pointTo) - sta.HeadDeviceId = id - sta.DevicePort = port - sta.HeadOffset = offset - sta.PointTo = pointTo - sta.TrainKilometer = kilometer - sta.RunDirection = runDirection - //判定车头方向 - sta.HeadDirection = runDirection - if sta.VobcState != nil { - if sta.VobcState.DirectionForward { - sta.HeadDirection = runDirection - } else if sta.VobcState.DirectionBackward { - sta.HeadDirection = !runDirection - } - } - if info.Speed < 0 { - sta.RunDirection = !sta.RunDirection - } - // 赋值动力学信息 - sta.DynamicState.Heartbeat = int32(info.LifeSignal) - sta.DynamicState.HeadLinkId = strconv.Itoa(int(info.Link)) - sta.DynamicState.HeadLinkOffset = int64(info.LinkOffset) - sta.DynamicState.Slope = int32(info.Slope) - sta.DynamicState.Upslope = info.UpSlope - sta.DynamicState.RunningUp = info.Up - sta.DynamicState.RunningResistanceSum = float32(info.TotalResistance) / 1000 - sta.DynamicState.AirResistance = float32(info.AirResistance) / 1000 - sta.DynamicState.RampResistance = float32(info.SlopeResistance) / 1000 - sta.DynamicState.CurveResistance = float32(info.CurveResistance) / 1000 - sta.DynamicState.Speed = speedParse(info.Speed) - sta.DynamicState.HeadSensorSpeed1 = speedParse(info.HeadSpeed1) - sta.DynamicState.HeadSensorSpeed2 = speedParse(info.HeadSpeed2) - sta.DynamicState.TailSensorSpeed1 = speedParse(info.TailSpeed1) - sta.DynamicState.TailSensorSpeed2 = speedParse(info.TailSpeed2) - sta.DynamicState.HeadRadarSpeed = speedParse(info.HeadRadarSpeed) - sta.DynamicState.TailRadarSpeed = speedParse(info.TailRadarSpeed) + //var vs *memory.VerifyStructure + //linkId := int32(info.Link) + //for _, mapId := range simulation.MapIds { + // vm := memory.QueryMapVerifyStructure(mapId) + // if vm.LinkModelMap[linkId] == nil { + // continue + // } + // vs = vm + // break + //} + //zap.S().Debugf("原始消息：[%d-%d-%d]", info.Number, info.Link, info.LinkOffset) + //id, port, offset, runDirection, pointTo, kilometer := memory.QueryDeviceByCalcLink(vs, linkId, int64(info.LinkOffset), info.Up, sta.RunDirection) + //zap.S().Debugf("转换后的消息：[%d-车头:%s-偏移:%d-上行:%v-是否ab:%v]", info.Number, id, offset, runDirection, pointTo) + //sta.HeadDeviceId = id + //sta.DevicePort = port + //sta.HeadOffset = offset + //sta.PointTo = pointTo + //sta.TrainKilometer = kilometer + //sta.RunDirection = runDirection + ////判定车头方向 + //sta.HeadDirection = runDirection + //if sta.VobcState != nil { + // if sta.VobcState.DirectionForward { + // sta.HeadDirection = runDirection + // } else if sta.VobcState.DirectionBackward { + // sta.HeadDirection = !runDirection + // } + //} + //if info.Speed < 0 { + // sta.RunDirection = !sta.RunDirection + //} + //// 赋值动力学信息 + //sta.DynamicState.Heartbeat = int32(info.LifeSignal) + //sta.DynamicState.HeadLinkId = strconv.Itoa(int(info.Link)) + //sta.DynamicState.HeadLinkOffset = int64(info.LinkOffset) + //sta.DynamicState.Slope = int32(info.Slope) + //sta.DynamicState.Upslope = info.UpSlope + //sta.DynamicState.RunningUp = info.Up + //sta.DynamicState.RunningResistanceSum = float32(info.TotalResistance) / 1000 + //sta.DynamicState.AirResistance = float32(info.AirResistance) / 1000 + //sta.DynamicState.RampResistance = float32(info.SlopeResistance) / 1000 + //sta.DynamicState.CurveResistance = float32(info.CurveResistance) / 1000 + //sta.DynamicState.Speed = speedParse(info.Speed) + //sta.DynamicState.HeadSensorSpeed1 = speedParse(info.HeadSpeed1) + //sta.DynamicState.HeadSensorSpeed2 = speedParse(info.HeadSpeed2) + //sta.DynamicState.TailSensorSpeed1 = speedParse(info.TailSpeed1) + //sta.DynamicState.TailSensorSpeed2 = speedParse(info.TailSpeed2) + //sta.DynamicState.HeadRadarSpeed = speedParse(info.HeadRadarSpeed) + //sta.DynamicState.TailRadarSpeed = speedParse(info.TailRadarSpeed) return sta } @@ -233,62 +258,127 @@ func dynamicsRun(verifySimulation *memory.VerifySimulation) { }) } -func buildLineBaseInfo(vs *memory.VerifyStructure) *dynamics.LineBaseInfo { - var links []*dynamics.Link - var slopes []*dynamics.Slope - var curves []*dynamics.Curve - for _, link := range vs.LinkModelMap { - id, _ := strconv.Atoi(link.Index) - var aTurnoutId int - var aPort string - if link.ARelatedSwitchRef != nil && link.ARelatedSwitchRef.SwitchDevice != nil { - aTurnoutId, _ = strconv.Atoi(link.ARelatedSwitchRef.SwitchDevice.GetIndex()) - aPort = link.ARelatedSwitchRef.Port.Name() +func buildLineBaseInfo(repo *repository.Repository) *dynamics.LineBaseInfo { + info := &dynamics.LineBaseInfo{} + for _, model := range repo.LinkList() { + id, _ := strconv.Atoi(model.Id()) + link := &dynamics.Link{ + ID: int32(id), + Len: int32(model.Length()), } - var bTurnoutId int - var bPort string - if link.BRelatedSwitchRef != nil && link.BRelatedSwitchRef.SwitchDevice != nil { - bTurnoutId, _ = strconv.Atoi(link.BRelatedSwitchRef.SwitchDevice.GetIndex()) - bPort = link.BRelatedSwitchRef.Port.Name() + info.LinkList = append(info.LinkList, link) + if model.ARelation() != nil { + turnoutId, _ := strconv.Atoi(model.ARelation().Device().Id()) + link.ARelTurnoutId = int32(turnoutId) + switch model.ARelation().Port() { + case proto.Port_A: + link.ARelTurnoutPoint = "A" + case proto.Port_B: + link.ARelTurnoutPoint = "B" + case proto.Port_C: + link.ARelTurnoutPoint = "C" + } + } + if model.BRelation() != nil { + turnoutId, _ := strconv.Atoi(model.BRelation().Device().Id()) + link.BRelTurnoutId = int32(turnoutId) + switch model.BRelation().Port() { + case proto.Port_A: + link.BRelTurnoutPoint = "A" + case proto.Port_B: + link.BRelTurnoutPoint = "B" + case proto.Port_C: + link.BRelTurnoutPoint = "C" + } } - links = append(links, &dynamics.Link{ - ID: int32(id), - Len: link.Length, - ARelTurnoutId: int32(aTurnoutId), - ARelTurnoutPoint: aPort, - BRelTurnoutId: int32(bTurnoutId), - BRelTurnoutPoint: bPort, - }) } - for _, slope := range vs.SlopeModelMap { - id, _ := strconv.Atoi(slope.Index) - slopes = append(slopes, &dynamics.Slope{ + for _, model := range repo.SlopeList() { + id, _ := strconv.Atoi(model.Id()) + slope := &dynamics.Slope{ ID: int32(id), - StartLinkId: slope.StartLinkIndex, - StartLinkOffset: slope.StartLinkOffset, - EndLinkId: slope.EndLinkIndex, - EndLinkOffset: slope.EndLinkOffset, - DegreeTrig: slope.DegreeTrig, - }) + StartLinkOffset: int32(model.StartLinkPosition().Offset()), + EndLinkOffset: int32(model.EndLinkPosition().Offset()), + DegreeTrig: model.Degree(), + } + info.SlopeList = append(info.SlopeList, slope) + startLinkId, _ := strconv.Atoi(model.StartLinkPosition().Link().Id()) + slope.StartLinkId = int32(startLinkId) + endLinkId, _ := strconv.Atoi(model.EndLinkPosition().Link().Id()) + slope.EndLinkId = int32(endLinkId) } - for _, curve := range vs.CurveModelMap { - id, _ := strconv.Atoi(curve.Index) - curves = append(curves, &dynamics.Curve{ + for _, model := range repo.SectionalCurvatureList() { + id, _ := strconv.Atoi(model.Id()) + curve := &dynamics.Curve{ ID: int32(id), - StartLinkId: curve.StartLinkIndex, - StartLinkOffset: curve.StartLinkOffset, - EndLinkId: curve.EndLinkIndex, - EndLinkOffset: curve.EndLinkOffset, - Curvature: curve.Curvature, - }) - } - return &dynamics.LineBaseInfo{ - LinkList: links, - SlopeList: slopes, - CurveList: curves, + StartLinkOffset: int32(model.StartLinkPosition().Offset()), + EndLinkOffset: int32(model.EndLinkPosition().Offset()), + Curvature: model.Radius(), + } + info.CurveList = append(info.CurveList, curve) + startLinkId, _ := strconv.Atoi(model.StartLinkPosition().Link().Id()) + curve.StartLinkId = int32(startLinkId) + endLinkId, _ := strconv.Atoi(model.EndLinkPosition().Link().Id()) + curve.EndLinkId = int32(endLinkId) } + return info } +//func buildLineBaseInfo(vs *memory.VerifyStructure) *dynamics.LineBaseInfo { +// var links []*dynamics.Link +// var slopes []*dynamics.Slope +// var curves []*dynamics.Curve +// for _, link := range vs.LinkModelMap { +// id, _ := strconv.Atoi(link.Index) +// var aTurnoutId int +// var aPort string +// if link.ARelatedSwitchRef != nil && link.ARelatedSwitchRef.SwitchDevice != nil { +// aTurnoutId, _ = strconv.Atoi(link.ARelatedSwitchRef.SwitchDevice.GetIndex()) +// aPort = link.ARelatedSwitchRef.Port.Name() +// } +// var bTurnoutId int +// var bPort string +// if link.BRelatedSwitchRef != nil && link.BRelatedSwitchRef.SwitchDevice != nil { +// bTurnoutId, _ = strconv.Atoi(link.BRelatedSwitchRef.SwitchDevice.GetIndex()) +// bPort = link.BRelatedSwitchRef.Port.Name() +// } +// links = append(links, &dynamics.Link{ +// ID: int32(id), +// Len: link.Length, +// ARelTurnoutId: int32(aTurnoutId), +// ARelTurnoutPoint: aPort, +// BRelTurnoutId: int32(bTurnoutId), +// BRelTurnoutPoint: bPort, +// }) +// } +// for _, slope := range vs.SlopeModelMap { +// id, _ := strconv.Atoi(slope.Index) +// slopes = append(slopes, &dynamics.Slope{ +// ID: int32(id), +// StartLinkId: slope.StartLinkIndex, +// StartLinkOffset: slope.StartLinkOffset, +// EndLinkId: slope.EndLinkIndex, +// EndLinkOffset: slope.EndLinkOffset, +// DegreeTrig: slope.DegreeTrig, +// }) +// } +// for _, curve := range vs.CurveModelMap { +// id, _ := strconv.Atoi(curve.Index) +// curves = append(curves, &dynamics.Curve{ +// ID: int32(id), +// StartLinkId: curve.StartLinkIndex, +// StartLinkOffset: curve.StartLinkOffset, +// EndLinkId: curve.EndLinkIndex, +// EndLinkOffset: curve.EndLinkOffset, +// Curvature: curve.Curvature, +// }) +// } +// return &dynamics.LineBaseInfo{ +// LinkList: links, +// SlopeList: slopes, +// CurveList: curves, +// } +//} + // 解析VOBC列车信息 func decoderVobcTrainState(buf []byte) *state.TrainVobcState { trainVobcInfo := &state.TrainVobcState{} diff --git a/ats/verify/simulation/wayside/memory/wayside_memory.go b/ats/verify/simulation/wayside/memory/wayside_memory.go index aa77b8c..d968104 100644 --- a/ats/verify/simulation/wayside/memory/wayside_memory.go +++ b/ats/verify/simulation/wayside/memory/wayside_memory.go @@ -43,12 +43,12 @@ type WaysideMemory struct { rwLock *sync.RWMutex } -// 初始化轨旁仿真内存模型 -func (memory *WaysideMemory) Create() *WaysideMemory { - memory.Status = new(VerifyStatus) - memory.ChangeStatus = &ChangeVerifyStatus{} - memory.rwLock = new(sync.RWMutex) - return memory +func NewWaysideMemory() *WaysideMemory { + return &WaysideMemory{ + Status: &VerifyStatus{}, + ChangeStatus: &ChangeVerifyStatus{}, + rwLock: &sync.RWMutex{}, + } } // 状态读保护操作 diff --git a/ats/verify/simulation/wayside/memory/wayside_memory_map.go b/ats/verify/simulation/wayside/memory/wayside_memory_map.go index 42ec6c5..8397ed1 100644 --- a/ats/verify/simulation/wayside/memory/wayside_memory_map.go +++ b/ats/verify/simulation/wayside/memory/wayside_memory_map.go @@ -3,6 +3,7 @@ package memory import ( "container/list" "fmt" + "joylink.club/rtsssimulation/repository" "math" "sort" "strconv" @@ -15,14 +16,16 @@ import ( "joylink.club/bj-rtsts-server/ats/verify/simulation/wayside/model/device" "joylink.club/bj-rtsts-server/ats/verify/simulation/wayside/model/ref" "joylink.club/bj-rtsts-server/ats/verify/simulation/wayside/model/section" - "joylink.club/bj-rtsts-server/db/dbquery" "joylink.club/bj-rtsts-server/db/model" "joylink.club/bj-rtsts-server/dto" ) -// 仿真存储集合 ID -var graphicDataMap sync.Map -var graphicSourceDataMap sync.Map +var ( + graphicStorageMap sync.Map + //// 仿真存储集合 ID + //graphicDataMap sync.Map + //graphicSourceDataMap sync.Map +) // VerifyStructure 轨旁仿真模型结构 type VerifyStructure struct { @@ -112,44 +115,58 @@ func PublishMapVerifyStructure(graphic *model.PublishedGi) *VerifyStructure { CurvatureKiloMarkerMap: make(map[string]*graphicData.CurvatureKiloMarker), } graphicStorage := &graphicData.RtssGraphicStorage{} - proto.Unmarshal(graphic.Proto, graphicStorage) + err := proto.Unmarshal(graphic.Proto, graphicStorage) + if err != nil { + panic(fmt.Sprintf("proto数据反序列化失败：%s", err)) + } + graphicStorageMap.Store(graphic.ID, graphicStorage) // 初始化地图结构 initGraphicStructure(graphicStorage, verifyStructure, graphicInfoMap) - // 构建设备间的关联关系(8.8 注释掉构建逻辑) - buildDeviceRef(graphicInfoMap, verifyStructure) - graphicDataMap.Store(graphic.ID, verifyStructure) - // 地图原始数据 - graphicSourceDataMap.Store(graphic.ID, graphicInfoMap) + //// 构建设备间的关联关系(8.8 注释掉构建逻辑) + //buildDeviceRef(graphicInfoMap, verifyStructure) + //graphicDataMap.Store(graphic.ID, verifyStructure) + //// 地图原始数据 + //graphicSourceDataMap.Store(graphic.ID, graphicInfoMap) return verifyStructure } // 移除内存中的地图信息 func DeleteMapVerifyStructure(mapId int32) { - graphicDataMap.Delete(mapId) - graphicSourceDataMap.Delete(mapId) + //graphicDataMap.Delete(mapId) + //graphicSourceDataMap.Delete(mapId) +} + +func QueryGraphicStorage(mapId int32) *graphicData.RtssGraphicStorage { + value, ok := graphicStorageMap.Load(mapId) + if ok { + return value.(*graphicData.RtssGraphicStorage) + } + return nil } // 获取内存中的地图信息 func QueryMapVerifyStructure(mapId int32) *VerifyStructure { - d, ok := graphicDataMap.Load(mapId) - if ok { - return d.(*VerifyStructure) - } - mapData, _ := dbquery.PublishedGi.Where(dbquery.PublishedGi.ID.Eq(mapId), dbquery.PublishedGi.Status.Eq(1)).First() - if mapData != nil { - return PublishMapVerifyStructure(mapData) - } else { - panic(fmt.Sprintf("地图【id:%d】不存在", mapId)) - } + //d, ok := graphicDataMap.Load(mapId) + //if ok { + // return d.(*VerifyStructure) + //} + //mapData, _ := dbquery.PublishedGi.Where(dbquery.PublishedGi.ID.Eq(mapId), dbquery.PublishedGi.Status.Eq(1)).First() + //if mapData != nil { + // return PublishMapVerifyStructure(mapData) + //} else { + // panic(fmt.Sprintf("地图【id:%d】不存在", mapId)) + //} + return nil } // 获取内存中地图原始信息 func QueryMapSourceDataStructure(mapId int32) *GraphicInfoMapStructure { - d, ok := graphicSourceDataMap.Load(mapId) - if ok { - return d.(*GraphicInfoMapStructure) - } - panic(fmt.Sprintf("地图【id:%d】数据不存在", mapId)) + //d, ok := graphicSourceDataMap.Load(mapId) + //if ok { + // return d.(*GraphicInfoMapStructure) + //} + //panic(fmt.Sprintf("地图【id:%d】数据不存在", mapId)) + return nil } // 根据区段，道岔偏移量返回linkID和link相对偏移量 @@ -276,117 +293,241 @@ Outter: // 根据linkID和link相对偏移量返回区段，道岔偏移量 // 设备ID、端口、偏移量、上下行、AB走向 -func QueryDeviceByCalcLink(vm *VerifyStructure, id int32, offset int64, up, defaultRunDirection bool) (string, string, int64, bool, bool, int64) { - linkModel := vm.LinkModelMap[id] - if linkModel == nil { - panic(dto.ErrorDto{Code: dto.DataNotExist, Message: fmt.Sprintf("未找到link【%d】", id)}) - } - if offset > int64(linkModel.Length) { - panic(dto.ErrorDto{Code: dto.DataNotExist, Message: fmt.Sprintf("偏移超出link范围【%d】", id)}) - } - calcPositionArr := convertPositionToCalcPosition(linkModel) // 转换位置对象 - var devicePosition, calcPosition *calcLinkPositionStruct // 获取当前、下一个节点，偏移量在这个范围中 - for _, v := range calcPositionArr { - if v.position.Offset > int32(offset) { - calcPosition = v - break - } else { - devicePosition = v - } - } - // 运行方向 - var runDirection bool - if calcPosition != nil { - runDirection = (calcPosition.kilometer.Kilometer >= devicePosition.kilometer.Kilometer) == up - } else { - runDirection = defaultRunDirection - } - isSwitch := (devicePosition.deviceType == 2) // 道岔 - // 获取另一个端点 - if calcPosition != nil { - isSwitch = isSwitch || calcPosition.deviceType == 2 // 道岔 - } - if isSwitch { - var sid string - var port string - var op int64 - var trainOffset int64 - var trainKilometer int64 - var tendTo bool - if devicePosition.deviceType == 2 { - sid = devicePosition.index - op = int64(devicePosition.position.Offset) - trainKilometer = devicePosition.kilometer.Kilometer - } else { - sid = calcPosition.index - op = int64(calcPosition.position.Offset) - trainKilometer = calcPosition.kilometer.Kilometer - } - tm := vm.SwitchDeviceModelMap[sid] - if tm == nil { - panic(dto.ErrorDto{Code: dto.DataNotExist, Message: fmt.Sprintf("不存在道岔【index:%s】", sid)}) - } - if linkModel.ARelatedSwitchRef.SwitchDevice != nil && linkModel.ARelatedSwitchRef.SwitchDevice.GetIndex() == sid { // 起始点 - port, trainOffset, tendTo = linkModel.ARelatedSwitchRef.Port.Name(), offset-op, !up - } else if linkModel.BRelatedSwitchRef.SwitchDevice != nil && linkModel.BRelatedSwitchRef.SwitchDevice.GetIndex() == sid { // 结束点 - port, trainOffset, tendTo = linkModel.BRelatedSwitchRef.Port.Name(), op-offset, up - } else { - panic(dto.ErrorDto{Code: dto.DataNotExist, Message: fmt.Sprintf("不存在道岔【index:%s】", devicePosition.index)}) - } - trainKilometer = concertTrainKilometer(trainKilometer, trainOffset, tendTo) - // return sid, linkModel.ARelatedSwitchRef.Port.Name(), offset - op, runDirection, !up - // return sid, linkModel.BRelatedSwitchRef.Port.Name(), op - offset, runDirection, up - return sid, port, trainOffset, runDirection, tendTo, trainKilometer - } else { - sectionModel, ok := linkOffsetQuerySection(vm, devicePosition, calcPosition) - if ok { - isEnd := (calcPosition == nil) && (offset == int64(linkModel.Length)) // 是否已经走到尽头 - pointA := sectionModel.PortAxlePoints[face.A.Name()] - var trainOffset int64 - var trainKilometer int64 - var tendTo bool - var bk *graphicData.KilometerSystem - if calcPosition != nil { - bk = calcPosition.kilometer - } - if devicePosition.index == pointA.GetIndex() { - trainOffset = offset - int64(devicePosition.position.Offset) - trainKilometer = devicePosition.kilometer.Kilometer - tendTo = convertPointTo(devicePosition.kilometer, bk, runDirection) - } else if calcPosition != nil { - trainOffset = int64(calcPosition.position.Offset) - offset - trainKilometer = bk.Kilometer - tendTo = convertPointTo(bk, devicePosition.kilometer, runDirection) - } else { - for _, v := range calcPositionArr { - if v.deviceType == 1 && v.index == pointA.GetIndex() { // 计轴 - trainKilometer = v.kilometer.Kilometer - if isEnd { - trainOffset = offset - int64(v.position.Offset) - tendTo = convertPointTo(v.kilometer, nil, runDirection) - } else { - trainOffset = int64(v.position.Offset) - offset - tendTo = convertPointTo(v.kilometer, devicePosition.kilometer, runDirection) - } - break - } - } - if trainKilometer == 0 { - panic(dto.ErrorDto{Code: dto.DataNotExist, Message: fmt.Sprintf("区段【%s】A端计轴缺失", sectionModel.GraphicId)}) - } - } - trainKilometer = concertTrainKilometer(trainKilometer, trainOffset, tendTo) - // return sectionModel.Index, "", offset - int64(devicePosition.position.Offset), runDirection, convertPointTo(devicePosition.kilometer, bk, runDirection) - // return sectionModel.Index, "", int64(calcPosition.position.Offset) - offset, runDirection, convertPointTo(bk, devicePosition.kilometer, runDirection) - // return sectionModel.Index, "", offset - int64(v.position.Offset), runDirection, convertPointTo(v.kilometer, nil, runDirection) - // return sectionModel.Index, "", int64(v.position.Offset) - offset, runDirection, convertPointTo(v.kilometer, devicePosition.kilometer, runDirection) - return sectionModel.Index, "", trainOffset, runDirection, tendTo, trainKilometer - } else { - panic(dto.ErrorDto{Code: dto.DataNotExist, Message: fmt.Sprintf("未找到区段【index:%s-index:%s】", devicePosition.index, calcPosition.index)}) - } - } +func QueryDeviceByCalcLink(repo *repository.Repository, id int32, offset int64, up, defaultRunDirection bool) (string, string, int64, bool, bool, int64) { + //link := repo.FindLink(strconv.Itoa(int(id))) + //if link == nil { + // panic(dto.ErrorDto{Code: dto.DataNotExist, Message: fmt.Sprintf("未找到link【%d】", id)}) + //} + //if offset > link.Length() { + // panic(dto.ErrorDto{Code: dto.DataNotExist, Message: fmt.Sprintf("偏移超出link范围【%d】", id)}) + //} + //for _, model := range link.Devices() { + // physicalSection, ok := model.(*repository.PhysicalSection) + // if ok { + // if number.IsBetween(offset, physicalSection.StartLinkPosition().Offset(), physicalSection.EndLinkPosition().Offset()) { + // + // } + // } + // + //} + // + //calcPositionArr := convertPositionToCalcPosition(linkModel) // 转换位置对象 + //var devicePosition, calcPosition *calcLinkPositionStruct // 获取当前、下一个节点，偏移量在这个范围中 + //for _, v := range calcPositionArr { + // if v.position.Offset > int32(offset) { + // calcPosition = v + // break + // } else { + // devicePosition = v + // } + //} + //// 运行方向 + //var runDirection bool + //if calcPosition != nil { + // runDirection = (calcPosition.kilometer.Kilometer >= devicePosition.kilometer.Kilometer) == up + //} else { + // runDirection = defaultRunDirection + //} + //isSwitch := (devicePosition.deviceType == 2) // 道岔 + //// 获取另一个端点 + //if calcPosition != nil { + // isSwitch = isSwitch || calcPosition.deviceType == 2 // 道岔 + //} + //if isSwitch { + // var sid string + // var port string + // var op int64 + // var trainOffset int64 + // var trainKilometer int64 + // var tendTo bool + // if devicePosition.deviceType == 2 { + // sid = devicePosition.index + // op = int64(devicePosition.position.Offset) + // trainKilometer = devicePosition.kilometer.Kilometer + // } else { + // sid = calcPosition.index + // op = int64(calcPosition.position.Offset) + // trainKilometer = calcPosition.kilometer.Kilometer + // } + // tm := vm.SwitchDeviceModelMap[sid] + // if tm == nil { + // panic(dto.ErrorDto{Code: dto.DataNotExist, Message: fmt.Sprintf("不存在道岔【index:%s】", sid)}) + // } + // if linkModel.ARelatedSwitchRef.SwitchDevice != nil && linkModel.ARelatedSwitchRef.SwitchDevice.GetIndex() == sid { // 起始点 + // port, trainOffset, tendTo = linkModel.ARelatedSwitchRef.Port.Name(), offset-op, !up + // } else if linkModel.BRelatedSwitchRef.SwitchDevice != nil && linkModel.BRelatedSwitchRef.SwitchDevice.GetIndex() == sid { // 结束点 + // port, trainOffset, tendTo = linkModel.BRelatedSwitchRef.Port.Name(), op-offset, up + // } else { + // panic(dto.ErrorDto{Code: dto.DataNotExist, Message: fmt.Sprintf("不存在道岔【index:%s】", devicePosition.index)}) + // } + // trainKilometer = concertTrainKilometer(trainKilometer, trainOffset, tendTo) + // // return sid, linkModel.ARelatedSwitchRef.Port.Name(), offset - op, runDirection, !up + // // return sid, linkModel.BRelatedSwitchRef.Port.Name(), op - offset, runDirection, up + // return sid, port, trainOffset, runDirection, tendTo, trainKilometer + //} else { + // sectionModel, ok := linkOffsetQuerySection(vm, devicePosition, calcPosition) + // if ok { + // isEnd := (calcPosition == nil) && (offset == int64(linkModel.Length)) // 是否已经走到尽头 + // pointA := sectionModel.PortAxlePoints[face.A.Name()] + // var trainOffset int64 + // var trainKilometer int64 + // var tendTo bool + // var bk *graphicData.KilometerSystem + // if calcPosition != nil { + // bk = calcPosition.kilometer + // } + // if devicePosition.index == pointA.GetIndex() { + // trainOffset = offset - int64(devicePosition.position.Offset) + // trainKilometer = devicePosition.kilometer.Kilometer + // tendTo = convertPointTo(devicePosition.kilometer, bk, runDirection) + // } else if calcPosition != nil { + // trainOffset = int64(calcPosition.position.Offset) - offset + // trainKilometer = bk.Kilometer + // tendTo = convertPointTo(bk, devicePosition.kilometer, runDirection) + // } else { + // for _, v := range calcPositionArr { + // if v.deviceType == 1 && v.index == pointA.GetIndex() { // 计轴 + // trainKilometer = v.kilometer.Kilometer + // if isEnd { + // trainOffset = offset - int64(v.position.Offset) + // tendTo = convertPointTo(v.kilometer, nil, runDirection) + // } else { + // trainOffset = int64(v.position.Offset) - offset + // tendTo = convertPointTo(v.kilometer, devicePosition.kilometer, runDirection) + // } + // break + // } + // } + // if trainKilometer == 0 { + // panic(dto.ErrorDto{Code: dto.DataNotExist, Message: fmt.Sprintf("区段【%s】A端计轴缺失", sectionModel.GraphicId)}) + // } + // } + // trainKilometer = concertTrainKilometer(trainKilometer, trainOffset, tendTo) + // // return sectionModel.Index, "", offset - int64(devicePosition.position.Offset), runDirection, convertPointTo(devicePosition.kilometer, bk, runDirection) + // // return sectionModel.Index, "", int64(calcPosition.position.Offset) - offset, runDirection, convertPointTo(bk, devicePosition.kilometer, runDirection) + // // return sectionModel.Index, "", offset - int64(v.position.Offset), runDirection, convertPointTo(v.kilometer, nil, runDirection) + // // return sectionModel.Index, "", int64(v.position.Offset) - offset, runDirection, convertPointTo(v.kilometer, devicePosition.kilometer, runDirection) + // return sectionModel.Index, "", trainOffset, runDirection, tendTo, trainKilometer + // } else { + // panic(dto.ErrorDto{Code: dto.DataNotExist, Message: fmt.Sprintf("未找到区段【index:%s-index:%s】", devicePosition.index, calcPosition.index)}) + // } + //} + return "", "", 0, false, false, 0 } +//// 根据linkID和link相对偏移量返回区段，道岔偏移量 +//// 设备ID、端口、偏移量、上下行、AB走向 +//func QueryDeviceByCalcLink(vm *VerifyStructure, id int32, offset int64, up, defaultRunDirection bool) (string, string, int64, bool, bool, int64) { +// linkModel := vm.LinkModelMap[id] +// if linkModel == nil { +// panic(dto.ErrorDto{Code: dto.DataNotExist, Message: fmt.Sprintf("未找到link【%d】", id)}) +// } +// if offset > int64(linkModel.Length) { +// panic(dto.ErrorDto{Code: dto.DataNotExist, Message: fmt.Sprintf("偏移超出link范围【%d】", id)}) +// } +// calcPositionArr := convertPositionToCalcPosition(linkModel) // 转换位置对象 +// var devicePosition, calcPosition *calcLinkPositionStruct // 获取当前、下一个节点，偏移量在这个范围中 +// for _, v := range calcPositionArr { +// if v.position.Offset > int32(offset) { +// calcPosition = v +// break +// } else { +// devicePosition = v +// } +// } +// // 运行方向 +// var runDirection bool +// if calcPosition != nil { +// runDirection = (calcPosition.kilometer.Kilometer >= devicePosition.kilometer.Kilometer) == up +// } else { +// runDirection = defaultRunDirection +// } +// isSwitch := (devicePosition.deviceType == 2) // 道岔 +// // 获取另一个端点 +// if calcPosition != nil { +// isSwitch = isSwitch || calcPosition.deviceType == 2 // 道岔 +// } +// if isSwitch { +// var sid string +// var port string +// var op int64 +// var trainOffset int64 +// var trainKilometer int64 +// var tendTo bool +// if devicePosition.deviceType == 2 { +// sid = devicePosition.index +// op = int64(devicePosition.position.Offset) +// trainKilometer = devicePosition.kilometer.Kilometer +// } else { +// sid = calcPosition.index +// op = int64(calcPosition.position.Offset) +// trainKilometer = calcPosition.kilometer.Kilometer +// } +// tm := vm.SwitchDeviceModelMap[sid] +// if tm == nil { +// panic(dto.ErrorDto{Code: dto.DataNotExist, Message: fmt.Sprintf("不存在道岔【index:%s】", sid)}) +// } +// if linkModel.ARelatedSwitchRef.SwitchDevice != nil && linkModel.ARelatedSwitchRef.SwitchDevice.GetIndex() == sid { // 起始点 +// port, trainOffset, tendTo = linkModel.ARelatedSwitchRef.Port.Name(), offset-op, !up +// } else if linkModel.BRelatedSwitchRef.SwitchDevice != nil && linkModel.BRelatedSwitchRef.SwitchDevice.GetIndex() == sid { // 结束点 +// port, trainOffset, tendTo = linkModel.BRelatedSwitchRef.Port.Name(), op-offset, up +// } else { +// panic(dto.ErrorDto{Code: dto.DataNotExist, Message: fmt.Sprintf("不存在道岔【index:%s】", devicePosition.index)}) +// } +// trainKilometer = concertTrainKilometer(trainKilometer, trainOffset, tendTo) +// // return sid, linkModel.ARelatedSwitchRef.Port.Name(), offset - op, runDirection, !up +// // return sid, linkModel.BRelatedSwitchRef.Port.Name(), op - offset, runDirection, up +// return sid, port, trainOffset, runDirection, tendTo, trainKilometer +// } else { +// sectionModel, ok := linkOffsetQuerySection(vm, devicePosition, calcPosition) +// if ok { +// isEnd := (calcPosition == nil) && (offset == int64(linkModel.Length)) // 是否已经走到尽头 +// pointA := sectionModel.PortAxlePoints[face.A.Name()] +// var trainOffset int64 +// var trainKilometer int64 +// var tendTo bool +// var bk *graphicData.KilometerSystem +// if calcPosition != nil { +// bk = calcPosition.kilometer +// } +// if devicePosition.index == pointA.GetIndex() { +// trainOffset = offset - int64(devicePosition.position.Offset) +// trainKilometer = devicePosition.kilometer.Kilometer +// tendTo = convertPointTo(devicePosition.kilometer, bk, runDirection) +// } else if calcPosition != nil { +// trainOffset = int64(calcPosition.position.Offset) - offset +// trainKilometer = bk.Kilometer +// tendTo = convertPointTo(bk, devicePosition.kilometer, runDirection) +// } else { +// for _, v := range calcPositionArr { +// if v.deviceType == 1 && v.index == pointA.GetIndex() { // 计轴 +// trainKilometer = v.kilometer.Kilometer +// if isEnd { +// trainOffset = offset - int64(v.position.Offset) +// tendTo = convertPointTo(v.kilometer, nil, runDirection) +// } else { +// trainOffset = int64(v.position.Offset) - offset +// tendTo = convertPointTo(v.kilometer, devicePosition.kilometer, runDirection) +// } +// break +// } +// } +// if trainKilometer == 0 { +// panic(dto.ErrorDto{Code: dto.DataNotExist, Message: fmt.Sprintf("区段【%s】A端计轴缺失", sectionModel.GraphicId)}) +// } +// } +// trainKilometer = concertTrainKilometer(trainKilometer, trainOffset, tendTo) +// // return sectionModel.Index, "", offset - int64(devicePosition.position.Offset), runDirection, convertPointTo(devicePosition.kilometer, bk, runDirection) +// // return sectionModel.Index, "", int64(calcPosition.position.Offset) - offset, runDirection, convertPointTo(bk, devicePosition.kilometer, runDirection) +// // return sectionModel.Index, "", offset - int64(v.position.Offset), runDirection, convertPointTo(v.kilometer, nil, runDirection) +// // return sectionModel.Index, "", int64(v.position.Offset) - offset, runDirection, convertPointTo(v.kilometer, devicePosition.kilometer, runDirection) +// return sectionModel.Index, "", trainOffset, runDirection, tendTo, trainKilometer +// } else { +// panic(dto.ErrorDto{Code: dto.DataNotExist, Message: fmt.Sprintf("未找到区段【index:%s-index:%s】", devicePosition.index, calcPosition.index)}) +// } +// } +//} + func linkOffsetQuerySection(vm *VerifyStructure, devicePosition, calcPosition *calcLinkPositionStruct) (*section.PhysicalSectionModel, bool) { var sectionModel *section.PhysicalSectionModel for _, s := range vm.PhysicalSectionModelMap { diff --git a/ats/verify/simulation/wayside/memory/wayside_simulation.go b/ats/verify/simulation/wayside/memory/wayside_simulation.go index ea2da5e..8f3c96f 100644 --- a/ats/verify/simulation/wayside/memory/wayside_simulation.go +++ b/ats/verify/simulation/wayside/memory/wayside_simulation.go @@ -1,7 +1,15 @@ package memory import ( + "fmt" + "joylink.club/bj-rtsts-server/ats/verify/protos/graphicData" "joylink.club/bj-rtsts-server/ats/verify/protos/state" + "joylink.club/rtsssimulation/repository" + "joylink.club/rtsssimulation/repository/model/proto" + "joylink.club/rtsssimulation/simulation" + "sort" + "strconv" + "strings" ) // 轨旁仿真定义 @@ -14,22 +22,60 @@ type VerifySimulation struct { SimulationId string //仿真内存数据 Memory *WaysideMemory + //模型仓库 + Repo *repository.Repository + //Rtss仿真世界的id + WorldId int } // 创建仿真对象 -func CreateSimulation(projectId int32, mapIds []int32) *VerifySimulation { - m := &WaysideMemory{} +func CreateSimulation(projectId int32, mapIds []int32) (*VerifySimulation, error) { + //构建Repository + sort.Slice(mapIds, func(i, j int) bool { + return mapIds[i] < mapIds[j] + }) + var mapIdStrSlice []string + for _, id := range mapIds { + mapIdStrSlice = append(mapIdStrSlice, strconv.Itoa(int(id))) + } + repoId := strings.Join(mapIdStrSlice, "|") + repoVersion := "0.1" + repo := repository.FindRepository(repoId, repoVersion) + if repo == nil { + var storages []*graphicData.RtssGraphicStorage + for _, mapId := range mapIds { + storages = append(storages, QueryGraphicStorage(mapId)) + } + protoRepo := buildProtoRepository(storages) + newRepo, err := repository.BuildRepository(protoRepo) + repo = newRepo + if err != nil { + return nil, err + } + } + //创建仿真 + worldId := simulation.CreateSimulation(repo, &simulation.WorldConfig{}) verifySimulation := &VerifySimulation{ MapIds: mapIds, ProjectId: projectId, - Memory: m.Create(), + Memory: NewWaysideMemory(), + Repo: repo, + WorldId: worldId, } - s := verifySimulation.Memory.Status - // 初始化构地图设备状态 - for _, mapId := range mapIds { - InitFromMap(s, QueryMapVerifyStructure(mapId)) - } - return verifySimulation + return verifySimulation, nil + + //m := &WaysideMemory{} + //verifySimulation := &VerifySimulation{ + // MapIds: mapIds, + // ProjectId: projectId, + // Memory: m.Create(), + //} + //s := verifySimulation.Memory.Status + //// 初始化构地图设备状态 + //for _, mapId := range mapIds { + // InitFromMap(s, QueryMapVerifyStructure(mapId)) + //} + //return verifySimulation } // 获取全量状态 @@ -55,3 +101,240 @@ func (s *VerifySimulation) GetChangeState() *state.PushedDevicesStatus { }, } } + +func buildProtoRepository(storages []*graphicData.RtssGraphicStorage) *proto.Repository { + repo := &proto.Repository{} + for _, storage := range storages { + fillProtoRepository(repo, storage) + } + return repo +} + +func fillProtoRepository(repo *proto.Repository, storage *graphicData.RtssGraphicStorage) { + axleCountingMap := make(map[string]*graphicData.AxleCounting) + for _, data := range storage.AxleCountings { + if data.KilometerSystem == nil { + println(fmt.Sprintf("计轴[%s]缺少公里标", data.Common.Id)) + continue + } + axleCountingMap[data.Common.Id] = data + cpType := proto.CheckPointType_AxleCounter + if data.Invent { + cpType = proto.CheckPointType_Boundary + } + cp := &proto.CheckPoint{ + Id: data.Common.Id, + Km: convertKm(data.KilometerSystem), + Type: cpType, + DevicePorts: convertDevicePorts(data.AxleCountingRef), + } + repo.CheckPoints = append(repo.CheckPoints, cp) + } + for _, data := range storage.Section { + var turnoutIds []string + if data.SectionType == graphicData.Section_TurnoutPhysical { + turnoutIds = findTurnoutIds(axleCountingMap, data.AxleCountings) + } + physicalSection := &proto.PhysicalSection{ + Id: data.Common.Id, + ADevicePort: convertDevicePort(data.PaRef), + BDevicePort: convertDevicePort(data.PbRef), + TurnoutIds: turnoutIds, + } + repo.PhysicalSections = append(repo.PhysicalSections, physicalSection) + } + for _, data := range storage.Turnouts { + var km *proto.Kilometer + for _, ks := range data.KilometerSystem { + if ks.Kilometer != 0 { + km = convertKm(ks) + break + } + } + for _, kc := range buildKmConverts(data.KilometerSystem) { + repo.KilometerConverts = append(repo.KilometerConverts, kc) + } + turnout := &proto.Turnout{ + Id: data.Common.Id, + Km: km, + ADevicePort: convertDevicePort(data.PaRef), + BDevicePort: convertDevicePort(data.PbRef), + CDevicePort: convertDevicePort(data.PcRef), + } + repo.Turnouts = append(repo.Turnouts, turnout) + } + for _, data := range storage.Signals { + var sectionId string + var turnoutPort *proto.DevicePort + switch data.RefDev.DeviceType { + case graphicData.RelatedRef_Section: + sectionId = data.RefDev.Id + case graphicData.RelatedRef_Turnout: + turnoutPort = convertDevicePort(data.RefDev) + } + signal := &proto.Signal{ + Id: data.Common.Id, + Km: convertKm(data.KilometerSystem), + SectionId: sectionId, + TurnoutPort: turnoutPort, + } + repo.Signals = append(repo.Signals, signal) + } + for _, data := range storage.Transponders { + var sectionId string + var turnoutPort *proto.DevicePort + switch data.TransponderRef.DeviceType { + case graphicData.RelatedRef_Section: + sectionId = data.TransponderRef.Id + case graphicData.RelatedRef_Turnout: + turnoutPort = convertDevicePort(data.TransponderRef) + } + responder := &proto.Transponder{ + Id: data.Common.Id, + Km: convertKm(data.KilometerSystem), + SectionId: sectionId, + TurnoutPort: turnoutPort, + } + repo.Transponders = append(repo.Transponders, responder) + } + slopeKsMap := make(map[string]*graphicData.SlopeKiloMarker) + for _, data := range storage.SlopeKiloMarker { + slopeKsMap[data.Common.Id] = data + for _, kc := range buildKmConverts(data.KilometerSystem) { + repo.KilometerConverts = append(repo.KilometerConverts, kc) + } + } + curveKsMap := make(map[string]*graphicData.CurvatureKiloMarker) + for _, data := range storage.CurvatureKiloMarker { + curveKsMap[data.Common.Id] = data + for _, kc := range buildKmConverts(data.KilometerSystem) { + repo.KilometerConverts = append(repo.KilometerConverts, kc) + } + } + for _, data := range storage.Slopes { + var kms []*proto.Kilometer + for _, id := range data.RefDeviceId { + kms = append(kms, convertKm(slopeKsMap[id].KilometerSystem[0])) + } + slope := &proto.Slope{ + Id: data.Common.Id, + Kms: kms, + Degree: data.SlopeNumber, + } + repo.Slopes = append(repo.Slopes, slope) + } + for _, data := range storage.Curvatures { + var kms []*proto.Kilometer + for _, id := range data.RefDeviceId { + kms = append(kms, convertKm(curveKsMap[id].KilometerSystem[0])) + } + slope := &proto.SectionalCurvature{ + Id: data.Common.Id, + Kms: kms, + Radius: data.CurvatureNumber, + } + repo.SectionalCurvatures = append(repo.SectionalCurvatures, slope) + } +} + +func convertKm(ks *graphicData.KilometerSystem) *proto.Kilometer { + var dir proto.Direction + switch ks.Direction { + case graphicData.Direction_LEFT: + dir = proto.Direction_LEFT + case graphicData.Direction_RIGHT: + dir = proto.Direction_RIGHT + } + return &proto.Kilometer{ + Value: ks.Kilometer, + CoordinateSystem: ks.CoordinateSystem, + Direction: dir, + } +} + +func convertDevicePort(ref *graphicData.RelatedRef) *proto.DevicePort { + if ref == nil { + return nil + } + var deviceType proto.DeviceType + var port proto.Port + switch ref.DevicePort { + case graphicData.RelatedRef_A: + port = proto.Port_A + case graphicData.RelatedRef_B: + port = proto.Port_B + case graphicData.RelatedRef_C: + port = proto.Port_C + } + switch ref.DeviceType { + case graphicData.RelatedRef_Section: + deviceType = proto.DeviceType_DeviceType_PhysicalSection + case graphicData.RelatedRef_Turnout: + deviceType = proto.DeviceType_DeviceType_Turnout + default: + panic(fmt.Sprintf("异常的设备类型-%s", ref.DeviceType)) + } + return &proto.DevicePort{ + DeviceId: ref.Id, + DeviceType: deviceType, + Port: port, + } +} + +func convertDevicePorts(refList []*graphicData.RelatedRef) []*proto.DevicePort { + var dps []*proto.DevicePort + for _, ref := range refList { + dps = append(dps, convertDevicePort(ref)) + } + return dps +} + +func findTurnoutIds(axleCountingMap map[string]*graphicData.AxleCounting, axleIds []string) []string { + if len(axleIds) <= 2 { + return nil + } + turnoutMap := make(map[string]bool) + for _, axleId := range axleIds { + axle := axleCountingMap[axleId] + relTurnoutCount := 0 + var turnoutId string + for _, ref := range axle.AxleCountingRef { + if ref.DeviceType == graphicData.RelatedRef_Turnout { + relTurnoutCount++ + turnoutId = ref.Id + } + } + if relTurnoutCount == 1 { + turnoutMap[turnoutId] = true + } + } + var turnoutIds []string + for id, _ := range turnoutMap { + turnoutIds = append(turnoutIds, id) + } + return turnoutIds +} + +func buildKmConverts(ksList []*graphicData.KilometerSystem) []*proto.KilometerConvert { + var kmConverts []*proto.KilometerConvert + for i, ks := range ksList { + if ks.Kilometer == 0 { + continue + } + for j := i + 1; j < len(ksList); j++ { + if ks.Kilometer == 0 { + continue + } + kmConverts = append(kmConverts, buildKmConvert(ks, ksList[j])) + } + } + return kmConverts +} + +func buildKmConvert(ks1 *graphicData.KilometerSystem, ks2 *graphicData.KilometerSystem) *proto.KilometerConvert { + return &proto.KilometerConvert{ + KmA: convertKm(ks1), + KmB: convertKm(ks2), + SameTrend: false, + } +} diff --git a/bj-rtss-message b/bj-rtss-message index d1f19ee..473f7da 160000 --- a/bj-rtss-message +++ b/bj-rtss-message @@ -1 +1 @@ -Subproject commit d1f19ee2d5ee74bfdab38887d2c7137d67dd7574 +Subproject commit 473f7da13f142c51c774149002e5b8752b0e6825 diff --git a/go.mod b/go.mod index d2b1e01..20a5ec3 100644 --- a/go.mod +++ b/go.mod @@ -80,7 +80,7 @@ require ( golang.org/x/net v0.12.0 // indirect golang.org/x/sys v0.10.0 // indirect golang.org/x/text v0.11.0 // indirect - google.golang.org/protobuf v1.30.0 + google.golang.org/protobuf v1.31.0 gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 3413569..4e7a346 100644 --- a/go.sum +++ b/go.sum @@ -682,8 +682,7 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/go.work.sum b/go.work.sum index 6114107..e4c046e 100644 --- a/go.work.sum +++ b/go.work.sum @@ -134,6 +134,7 @@ github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/denisenkom/go-mssqldb v0.12.0/go.mod h1:iiK0YP1ZeepvmBQk/QpLEhhTNJgfzrpArPY/aFvc9yU= +github.com/ebitengine/purego v0.1.0/go.mod h1:Eh8I3yvknDYZeCuXH9kRNaPuHEwvXDCk378o9xszmHg= github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI= github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= @@ -141,6 +142,7 @@ github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7z github.com/gin-contrib/gzip v0.0.6/go.mod h1:QOJlmV2xmayAjkNS2Y8NQsMneuRShOU/kjovCXNuzzk= github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw= github.com/go-faster/errors v0.6.1/go.mod h1:5MGV2/2T9yvlrbhe9pD9LO5Z/2zCSq2T8j+Jpi2LAyY= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20220806181222-55e207c401ad/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= @@ -152,6 +154,8 @@ github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkj github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= +github.com/hajimehoshi/ebiten/v2 v2.4.13/go.mod h1:BZcqCU4XHmScUi+lsKexocWcf4offMFwfp8dVGIB/G4= +github.com/hajimehoshi/file2byteslice v1.0.0/go.mod h1:CqqAHp7Dk/AqQiwuhV1yT2334qbA/tFWQW0MD2dGqUE= github.com/hashicorp/consul/api v1.20.0/go.mod h1:nR64eD44KQ59Of/ECwt2vUmIK2DKsDzAwTmwmLl8Wpo= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= @@ -168,6 +172,7 @@ github.com/jackc/pgproto3/v2 v2.3.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwX github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= github.com/jackc/pgtype v1.12.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= github.com/jackc/pgx/v4 v4.17.2/go.mod h1:lcxIZN44yMIrWI78a5CpucdD14hX0SBDbNRvjDBItsw= +github.com/jezek/xgb v1.0.1/go.mod h1:nrhwO0FX/enq75I7Y7G8iN1ubpSGZEiA3v9e9GyRFlk= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= @@ -183,12 +188,16 @@ github.com/sagikazarmark/crypt v0.10.0/go.mod h1:gwTNHQVoOS3xp9Xvz5LLR+1AauC5M68 github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= +github.com/yohamta/donburi v1.3.8/go.mod h1:5QkyraUjkzbMVTD2b8jaPFy1Uwjm/zdFN1c1lZGaezg= go.etcd.io/etcd/api/v3 v3.5.9/go.mod h1:uyAal843mC8uUVSLWz6eHa/d971iDGnCRpmKd2Z+X8k= go.etcd.io/etcd/client/pkg/v3 v3.5.9/go.mod h1:y+CzeSmkMpWN2Jyu1npecjB9BBnABxGM4pN8cGuJeL4= go.etcd.io/etcd/client/v2 v2.305.7/go.mod h1:GQGT5Z3TBuAQGvgPfhR7VPySu/SudxmEkRq9BgzFU6s= go.etcd.io/etcd/client/v3 v3.5.9/go.mod h1:i/Eo5LrZ5IKqpbtpPDuaUnDOUv471oDg8cjQaUr2MbA= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +golang.org/x/image v0.1.0/go.mod h1:iyPr49SD/G/TBxYVB/9RRtGUT5eNbo2u4NamWeQcD5c= +golang.org/x/mobile v0.0.0-20221012134814-c746ac228303/go.mod h1:M32cGdzp91A8Ex9qQtyZinr19EYxzkFqDjW2oyHzTDQ= golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/protobuf/file.bin b/protobuf/file.bin new file mode 100644 index 0000000000000000000000000000000000000000..669973d35fff9014b2b04b0eb1fb2f65569dce92 GIT binary patch literal 95419 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 z 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 literal 0 HcmV?d00001 diff --git a/protobuf/main_test.go b/protobuf/main_test.go index 816c481..f33bae1 100644 --- a/protobuf/main_test.go +++ b/protobuf/main_test.go @@ -24,8 +24,32 @@ func TestBuildRepository(t *testing.T) { } repo := &proto2.Repository{} + //todo 数据中id为379的区段B端无计轴，临时在代码里修改，后续删除 + storage.AxleCountings = append(storage.AxleCountings, &graphicData.AxleCounting{ + Common: &graphicData.CommonInfo{ + Id: "10000", + }, + KilometerSystem: &graphicData.KilometerSystem{ + Kilometer: 13403549, + CoordinateSystem: "MAIN_LINE", + Direction: graphicData.Direction_RIGHT, + }, + AxleCountingRef: []*graphicData.RelatedRef{{ + DeviceType: graphicData.RelatedRef_Section, + Id: "379", + DevicePort: graphicData.RelatedRef_B, + }}, + Index: 0, + Invent: false, + Type: 0, + }) + axleCountingMap := make(map[string]*graphicData.AxleCounting) for _, data := range storage.AxleCountings { + if data.KilometerSystem == nil { + println(fmt.Sprintf("计轴[%s]缺少公里标", data.Common.Id)) + continue + } axleCountingMap[data.Common.Id] = data cpType := proto2.CheckPointType_AxleCounter if data.Invent { @@ -98,13 +122,13 @@ func TestBuildRepository(t *testing.T) { case graphicData.RelatedRef_Turnout: turnoutPort = convertDevicePort(data.TransponderRef) } - responder := &proto2.Responder{ + responder := &proto2.Transponder{ Id: data.Common.Id, Km: convertKm(data.KilometerSystem), SectionId: sectionId, TurnoutPort: turnoutPort, } - repo.Responders = append(repo.Responders, responder) + repo.Transponders = append(repo.Transponders, responder) } slopeKsMap := make(map[string]*graphicData.SlopeKiloMarker) for _, data := range storage.SlopeKiloMarker {