diff --git a/adaptors/安心云es主题特征to广东省平台.go b/adaptors/安心云es主题特征to广东省平台.go index 69064e6..b53745e 100644 --- a/adaptors/安心云es主题特征to广东省平台.go +++ b/adaptors/安心云es主题特征to广东省平台.go @@ -134,12 +134,19 @@ func (the Adaptor_AXYES_GDJKJC) EsAgg2StatisticData(factorId int, monitorCode st YMax: maxAbsoluteValueY, YRms: rootMeanSquareY, //均方根 } - case 28: //振动 + case 25, 28: //振动 destStruct = GDJKJC.A48Acc{ CommonBody: commonBody, Max: maxAbsoluteValueX / 100, //省平台 加速度单位 m/s² 实际设备单位 cm/s² Rms: rootMeanSquareX / 100, //均方根 } + case 31: //水位 + destStruct = GDJKJC.SWWaterLevel{ + CommonBody: commonBody, + Max: dateBucket.X.Max, + Min: dateBucket.X.Min, + Avg: avgValueX, + } case 63: //支护结构变形(主梁位移) destStruct = GDJKJC.A40DisplacementBody{ CommonBody: commonBody, diff --git a/consumers/GDJKJC/bodyTemplate.go b/consumers/GDJKJC/bodyTemplate.go index 5c66129..a792037 100644 --- a/consumers/GDJKJC/bodyTemplate.go +++ b/consumers/GDJKJC/bodyTemplate.go @@ -157,6 +157,14 @@ type A50DisplacementBody struct { Rms float64 `json:"Rms"` //均方根值 } +// A50DisplacementBody 位移(支座位移、梁端纵向位移) +type SWWaterLevel struct { + CommonBody + Max float64 `json:"Max"` //最大值 + Min float64 `json:"Min"` //最小值 + Avg float64 `json:"Avg"` +} + // A51Crack 裂缝 type A51Crack struct { CommonBody