diff --git a/dto/data_proto/stationLayoutGraphics.pb.go b/dto/data_proto/stationLayoutGraphics.pb.go index 0d28fd5..09f45e4 100644 --- a/dto/data_proto/stationLayoutGraphics.pb.go +++ b/dto/data_proto/stationLayoutGraphics.pb.go @@ -927,7 +927,7 @@ type RtssGraphicStorage struct { TrackSections []*TrackSection `protobuf:"bytes,28,rep,name=trackSections,proto3" json:"trackSections,omitempty"` //轨道区段 TrackLogicSections []*TrackLogicSection `protobuf:"bytes,29,rep,name=trackLogicSections,proto3" json:"trackLogicSections,omitempty"` //轨道逻辑区段 // UniqueIdType UniqueIdPrefix = 30;//设备唯一编码--前缀 - UniqueIdPrefix *UniqueIdOfStationLayout `protobuf:"bytes,31,opt,name=UniqueIdPrefix,proto3" json:"UniqueIdPrefix,omitempty"` //设备唯一编码--前缀 + UniqueIdPrefix *UniqueIdOfStationLayout `protobuf:"bytes,31,opt,name=UniqueIdPrefix,proto3" json:"UniqueIdPrefix,omitempty"` //地图唯一信息 KilometerConvertList []*KilometerConvert `protobuf:"bytes,32,rep,name=kilometerConvertList,proto3" json:"kilometerConvertList,omitempty"` //公里标转换列表 ScreenDoors []*ScreenDoor `protobuf:"bytes,33,rep,name=screenDoors,proto3" json:"screenDoors,omitempty"` StationRelateDeviceList []*StationRelateDevice `protobuf:"bytes,34,rep,name=stationRelateDeviceList,proto3" json:"stationRelateDeviceList,omitempty"` // 关联设备列表 diff --git a/dto/state_proto/device_state.pb.go b/dto/state_proto/device_state.pb.go index 639ecf9..9985468 100644 --- a/dto/state_proto/device_state.pb.go +++ b/dto/state_proto/device_state.pb.go @@ -151,9 +151,11 @@ func (Signal_Aspect) EnumDescriptor() ([]byte, []int) { type TrainConnState_TrainConnType int32 const ( - TrainConnState_NONE TrainConnState_TrainConnType = 0 //未知连接 - TrainConnState_VOBC TrainConnState_TrainConnType = 1 //半实物 - TrainConnState_PC_SIM TrainConnState_TrainConnType = 2 //PC仿真 + TrainConnState_NONE TrainConnState_TrainConnType = 0 //未知连接 + TrainConnState_VOBC TrainConnState_TrainConnType = 1 //半实物 + // PC_SIM = 2; //PC仿真 + TrainConnState_PC_SIM_A TrainConnState_TrainConnType = 3 //PC仿真 + TrainConnState_PC_SIM_B TrainConnState_TrainConnType = 4 //PC仿真 ) // Enum value maps for TrainConnState_TrainConnType. @@ -161,12 +163,14 @@ var ( TrainConnState_TrainConnType_name = map[int32]string{ 0: "NONE", 1: "VOBC", - 2: "PC_SIM", + 3: "PC_SIM_A", + 4: "PC_SIM_B", } TrainConnState_TrainConnType_value = map[string]int32{ - "NONE": 0, - "VOBC": 1, - "PC_SIM": 2, + "NONE": 0, + "VOBC": 1, + "PC_SIM_A": 3, + "PC_SIM_B": 4, } ) @@ -988,7 +992,7 @@ type TrainState struct { DriftTo bool `protobuf:"varint,9,opt,name=driftTo,proto3" json:"driftTo,omitempty"` // 列车运营上下行（公里标 上行：小 -> 大，下行：大 -> 小） TrainRunUp bool `protobuf:"varint,10,opt,name=trainRunUp,proto3" json:"trainRunUp,omitempty"` - // 列车车头方向 0=未激活，1= 大 -> 小,2= 小 -> 大 + // 列车车头方向 0=未激活，1= 小 -> 大,2=大 -> 小 TrainActiveDirection uint32 `protobuf:"varint,11,opt,name=trainActiveDirection,proto3" json:"trainActiveDirection,omitempty"` // 动力学信息 DynamicState *TrainDynamicState `protobuf:"bytes,12,opt,name=dynamicState,proto3" json:"dynamicState,omitempty"` @@ -2273,7 +2277,7 @@ type TrainMapState struct { // // bool headDirection = 11; // - // 列车车头方向 0= 均为激活；1=向大，2=向小 + // 列车车头方向 0= 均为激活；1=向小，2=向大 TrainActiveDirection uint32 `protobuf:"varint,11,opt,name=trainActiveDirection,proto3" json:"trainActiveDirection,omitempty"` // 所在公里标 TrainKilometer int64 `protobuf:"varint,12,opt,name=trainKilometer,proto3" json:"trainKilometer,omitempty"` @@ -5147,7 +5151,7 @@ var file_device_state_proto_rawDesc = []byte{ 0x0b, 0x32, 0x10, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4d, 0x6b, 0x78, 0x4a, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x09, 0x6d, 0x6b, 0x78, 0x4a, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x1e, 0x0a, 0x0c, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x22, 0xc4, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x22, 0xd4, 0x01, 0x0a, 0x0e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x6e, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x63, 0x6f, 0x6e, 0x6e, 0x12, 0x3f, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x6e, 0x54, 0x79, 0x70, @@ -5157,10 +5161,11 @@ var file_device_state_proto_rawDesc = []byte{ 0x6e, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2c, 0x0a, 0x11, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x4d, 0x61, 0x70, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x11, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x4d, - 0x61, 0x70, 0x49, 0x64, 0x22, 0x2f, 0x0a, 0x0d, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, + 0x61, 0x70, 0x49, 0x64, 0x22, 0x3f, 0x0a, 0x0d, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, - 0x08, 0x0a, 0x04, 0x56, 0x4f, 0x42, 0x43, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x50, 0x43, 0x5f, - 0x53, 0x49, 0x4d, 0x10, 0x02, 0x22, 0xab, 0x08, 0x0a, 0x0a, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x53, + 0x08, 0x0a, 0x04, 0x56, 0x4f, 0x42, 0x43, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x50, 0x43, 0x5f, + 0x53, 0x49, 0x4d, 0x5f, 0x41, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x50, 0x43, 0x5f, 0x53, 0x49, + 0x4d, 0x5f, 0x42, 0x10, 0x04, 0x22, 0xab, 0x08, 0x0a, 0x0a, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x75, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x02, 0x75, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x70, 0x65, 0x65, 0x64, 0x18, 0x03, 0x20,