diff --git a/adaptors/知物云es主题特征to中交华联.go b/adaptors/知物云es主题特征to中交华联.go index 2fb7a52..d0a6eed 100644 --- a/adaptors/知物云es主题特征to中交华联.go +++ b/adaptors/知物云es主题特征to中交华联.go @@ -179,7 +179,7 @@ func (the Adaptor_ZWYES_ZJHL) EsAgg2StatisticData(factorId int, monitorCode int6 AvgValue: float32(avgValueX), RootMeanSquare: float32(rootMeanSquareX), }} - case 20: //支座位移 + case 20, 24: //支座位移20, 位移24 dataDefinitionStatisticData.StatisticData.DataBody = &protoFiles_zjhl.StatisticData_Dis{Dis: &protoFiles_zjhl.DISStatistic{ MaxAbsoluteValue: float32(maxAbsoluteValueX), AvgValue: float32(avgValueX), diff --git a/consumers/consumerGZG2ZJHL.go b/consumers/consumerGZG2ZJHL.go index 548de0f..8965797 100644 --- a/consumers/consumerGZG2ZJHL.go +++ b/consumers/consumerGZG2ZJHL.go @@ -376,7 +376,7 @@ func getEsAggSubSqlByZwyFactorId(factorId int) string { } } }` - case 20: + case 20, 24: subAggSQl = ` { "x": {