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 }