diff --git a/adaptors/安心云es数据to南京智行.go b/adaptors/安心云es数据to南京智行.go index f2df322..5a7f524 100644 --- a/adaptors/安心云es数据to南京智行.go +++ b/adaptors/安心云es数据to南京智行.go @@ -143,23 +143,20 @@ func (the *Adaptor_AXYES_NJZX) ChangeToNJZXData(factorId int, monitorCodeStr str CrackWidth: []float32{float32(dateBucket.Source.Data["crack"])}, }} case 103: //净空收敛//123456789 - dataDefinitionData.DataBody = &protoDataFiles.SensorData_Rhs{Rhs: &protoDataFiles.RHSRealTime{ - Temperature: []float32{float32(dateBucket.Source.Data["crack"])}, - Humidity: []float32{float32(dateBucket.Source.Data["crack"])}, + dataDefinitionData.DataBody = &protoDataFiles.SensorData_Disr{Disr: &protoDataFiles.DISRRealTime{ + Displacement: []float32{float32(dateBucket.Source.Data["displacement"])}, }} case 102: //拱顶沉降//123456789 - dataDefinitionData.DataBody = &protoDataFiles.SensorData_Rhs{Rhs: &protoDataFiles.RHSRealTime{ - Temperature: []float32{float32(dateBucket.Source.Data["crack"])}, - Humidity: []float32{float32(dateBucket.Source.Data["crack"])}, + dataDefinitionData.DataBody = &protoDataFiles.SensorData_Disr{Disr: &protoDataFiles.DISRRealTime{ + Displacement: []float32{float32(dateBucket.Source.Data["displacement"])}, }} case 96: //二次衬彻应变 dataDefinitionData.DataBody = &protoDataFiles.SensorData_Rsg{Rsg: &protoDataFiles.RSGRealTime{ Strain: []float32{float32(dateBucket.Source.Data["strain"])}, }} case 107: //道床及拱腰结构沉降//123456789 - dataDefinitionData.DataBody = &protoDataFiles.SensorData_Rhs{Rhs: &protoDataFiles.RHSRealTime{ - Temperature: []float32{float32(dateBucket.Source.Data["crack"])}, - Humidity: []float32{float32(dateBucket.Source.Data["crack"])}, + dataDefinitionData.DataBody = &protoDataFiles.SensorData_Disr{Disr: &protoDataFiles.DISRRealTime{ + Displacement: []float32{float32(dateBucket.Source.Data["displacement"])}, }} case 156: //风速 dataDefinitionData.DataBody = &protoDataFiles.SensorData_Wds{Wds: &protoDataFiles.WDSRealTime{ diff --git a/configFiles/config_安心云加依尔2号隧道_南京智行.yaml b/configFiles/config_安心云加依尔2号隧道_南京智行.yaml index 36c5673..b6e69eb 100644 --- a/configFiles/config_安心云加依尔2号隧道_南京智行.yaml +++ b/configFiles/config_安心云加依尔2号隧道_南京智行.yaml @@ -5,7 +5,7 @@ ioConfig: url: https://esproxy.anxinyun.cn/anxincloud_themes-2025/_search out: mqtt: - host: 120.205.24.17 + host: 120.205.24.27 port: 1883 userName: xjjyrsd password: xjjyrsd@2024 @@ -22,7 +22,7 @@ queryComponent: #结构物id对应 structInfo: #加依尔4983 -> 映射对方平台id - 4983: 56232 + 4983: 5623 #点位id对应信息 pointInfo: #监测因素 2温湿度 4温度 18裂缝检测 103净空收敛 102拱顶沉降 96二次衬彻应变 107道床及拱腰结构沉降 156风速 578风向