From 8a6d572297ec9100f9271e019b054262523b6d06 Mon Sep 17 00:00:00 2001
From: zhangyuxiang <1323804152@qq.com>
Date: Thu, 13 Nov 2025 13:11:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=89=E4=BF=A1=E6=99=BA?=
 =?UTF-8?q?=E5=AE=B8=E5=A4=A9=E9=A9=B0=E5=91=8A=E8=AD=A6=E7=AD=89=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 consumers/consumerZWYHBJCAS.go | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/consumers/consumerZWYHBJCAS.go b/consumers/consumerZWYHBJCAS.go
index 2e0251a..361303e 100644
--- a/consumers/consumerZWYHBJCAS.go
+++ b/consumers/consumerZWYHBJCAS.go
@@ -666,13 +666,14 @@ func (the *consumerZWYHBJCAS) onData(topic string, msg string) bool {
 		err := json.Unmarshal([]byte(msg), &alarmData)
 		if err != nil {
 			log.Printf("反序列化 异常 alarm数据=%s", msg)
-		}
-		if alarmData.AlarmTypeCode == "3007" && the.JudgeExist(alarmData.StructureId) {
-			//收到配置结构物产生的超阈值告警
-			alarms := the.getAlarmInfo(alarmData)
-			if len(alarms) > 0 {
-				//生成了告警，进行推送
-				the.UploadAlarmInfo(alarms)
+		} else {
+			if alarmData.AlarmTypeCode == "3007" && the.JudgeExist(alarmData.StructureId) {
+				//收到配置结构物产生的超阈值告警
+				alarms := the.getAlarmInfo(alarmData)
+				if len(alarms) > 0 {
+					//生成了告警，进行推送
+					the.UploadAlarmInfo(alarms)
+				}
 			}
 		}
 	}
@@ -691,11 +692,11 @@ func (the *consumerZWYHBJCAS) JudgeExist(structId int) bool {
 func GetLevel(alarmCode string) int {
 	switch alarmCode {
 	case "30070001":
-		return 1
+		return 3
 	case "30070002":
 		return 2
 	case "30070003":
-		return 3
+		return 1
 	default:
 		return 0
 	}