|
@ -173,6 +173,12 @@ func (the Adaptor_ZWYES_ZJHL) EsAgg2StatisticData(factorId int, monitorCode int6 |
|
|
RootMeanSquare: float32(rootMeanSquareX), |
|
|
RootMeanSquare: float32(rootMeanSquareX), |
|
|
TotalAbsoluteValue: float32(dateBucket.X.Max - dateBucket.X.Min), |
|
|
TotalAbsoluteValue: float32(dateBucket.X.Max - dateBucket.X.Min), |
|
|
}} |
|
|
}} |
|
|
|
|
|
case 19: //挠度监测
|
|
|
|
|
|
dataDefinitionStatisticData.StatisticData.DataBody = &protoFiles_zjhl.StatisticData_Hpt{Hpt: &protoFiles_zjhl.HPTStatistic{ |
|
|
|
|
|
MaxAbsoluteValue: float32(maxAbsoluteValueX), |
|
|
|
|
|
AvgValue: float32(avgValueX), |
|
|
|
|
|
RootMeanSquare: float32(rootMeanSquareX), |
|
|
|
|
|
}} |
|
|
case 20: //支座位移
|
|
|
case 20: //支座位移
|
|
|
dataDefinitionStatisticData.StatisticData.DataBody = &protoFiles_zjhl.StatisticData_Dis{Dis: &protoFiles_zjhl.DISStatistic{ |
|
|
dataDefinitionStatisticData.StatisticData.DataBody = &protoFiles_zjhl.StatisticData_Dis{Dis: &protoFiles_zjhl.DISStatistic{ |
|
|
MaxAbsoluteValue: float32(maxAbsoluteValueX), |
|
|
MaxAbsoluteValue: float32(maxAbsoluteValueX), |
|
|