diff --git a/config/bj_local_pxf.yml b/config/bj_local_pxf.yml index a38bc7b..ddf7b0e 100644 --- a/config/bj_local_pxf.yml +++ b/config/bj_local_pxf.yml @@ -15,7 +15,7 @@ logging: # 格式化 # format: json # 日志文件路径 - path: /logs/bjrtsts + path: /home/joylink/logs/bjrtsts # 日志文件名 fileName: bjrtsts.log # 单个日志文件大小,单位mb,超过会自动滚动 diff --git a/third_party/interlock/beijing11/repo.go b/third_party/interlock/beijing11/repo.go index 93bbb6a..20d0162 100644 --- a/third_party/interlock/beijing11/repo.go +++ b/third_party/interlock/beijing11/repo.go @@ -1,6 +1,7 @@ package beijing11 // StationDeviceIndexRepo 联锁站设备索引映射 +// key为联锁编号,val为uid type StationDeviceIndexRepo struct { StationName string TurnoutMap map[uint32]string diff --git a/third_party/interlock/beijing11/service.go b/third_party/interlock/beijing11/service.go index 24eb842..c3c6a6f 100644 --- a/third_party/interlock/beijing11/service.go +++ b/third_party/interlock/beijing11/service.go @@ -29,9 +29,20 @@ func init() { //if data.LianSuoData == nil { // return //} - ////初始化所有集中站设备映射结构体 + ////初始化所有集中站设备映射结构体;建立车站和集中站的comId映射关系 + //station_concentration_map := make(map[uint32]uint32) //for _, station := range data.Stations { - // stationMap[station.StationName] = NewStationDeviceIndexRepo() + // if station.ConcentrationStations { + // stationMap[station.StationName] = NewStationDeviceIndexRepo() + // for _, manageStation := range station.ManageStations { + // station_concentration_map[manageStation] = station.Common.Id + // } + // } + //} + ////建立站台和集中站的comId映射 + //platform_station_map := make(map[uint32]uint32) + //for _, platform := range data.Platforms { + // platform_station_map[platform.Common.Id] = station_concentration_map[platform.RefStationId] //} ////填充 //stationIdMap := uidStructure.StationIds @@ -39,15 +50,31 @@ func init() { //turnoutUidMap := uidStructure.TurnoutIds //turnoutIndexMap := make(map[uint32]uint32) //for _, turnout := range data.LianSuoData.Switchs { - // turnoutIndexMap[turnout.Id] = + // turnoutIndexMap[turnout.Id] = turnout.Index //} //for _, turnout := range data.Turnouts { - // for _, stationCid := range turnout.CentralizedStations { - // stationIdStruct := stationIdMap[stationCid] + // for _, stationComId := range turnout.CentralizedStations { + // stationIdStruct := stationIdMap[stationComId] // stationDeviceIndexRepo := stationMap[stationIdStruct.Code] - // stationDeviceIndexRepo.TurnoutMap[] + // index := turnoutIndexMap[turnout.Common.Id] + // stationDeviceIndexRepo.TurnoutMap[index] = turnoutUidMap[turnout.Common.Id].Uid // } //} + ////屏蔽门 + //psdUidMap := uidStructure.PsdIds + //psdIndexMap := make(map[uint32]uint32) + //for _, psd := range data.LianSuoData.ScreenDoors { + // psdIndexMap[psd.Id] = psd.Index + //} + //for _, psd := range data.ScreenDoors { + // stationComId := platform_station_map[psd.RefPlatformId] + // stationIdStruct := stationIdMap[stationComId] + // stationDeviceIndexRepo := stationMap[stationIdStruct.Code] + // index := psdIndexMap[psd.Common.Id] + // stationDeviceIndexRepo.PsdMap[index] = psdUidMap[psd.Common.Id].Uid + //} + ////紧急停车 + //uidStructure. }) }