From 2c2f063e21baa2cde36d9a75c01d3ff2755db89c Mon Sep 17 00:00:00 2001
From: lucas <lu.kai@free-sun.com.cn>
Date: Mon, 24 Feb 2025 13:47:10 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=BD=8D=E7=A7=BB24=20=20=E7=89=B9?=
 =?UTF-8?q?=E5=BE=81=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adaptors/知物云es主题特征to中交华联.go | 2 +-
 consumers/consumerGZG2ZJHL.go                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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": {