From c39d1409659ba252be12fa900a7123a24499d835 Mon Sep 17 00:00:00 2001
From: zhangyuxiang <1323804152@qq.com>
Date: Fri, 23 Jan 2026 17:12:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=86=E6=B1=9F=E5=A2=9E=E5=8A=A0=E7=82=B9?=
 =?UTF-8?q?=E4=BD=8D=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adaptors/安心云es主题特征to广东省平台.go | 9 ++++++++-
 consumers/GDJKJC/bodyTemplate.go                     | 8 ++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

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