Merge branch 'dev' of https://gitea.anxinyun.cn/lucas2/goUpload into dev

consumers/consumerAxySkAlarm.go

@@ -222,6 +222,11 @@ func (the *consumerAxySkAlarm) judgeSK() string {
 				payload := the.skAlarmInfo(alarmInfoTemplate, level, detail, alarmTime)
 				the.OutKafka.Publish(the.Info.IoConfig.Out.Kafka.AlarmTopic, payload)
 			} else {
+				if level == 0 {
+					if v, ok := the.historyStationAlarmMap[sid]; ok {
+						level = v.AlarmLevel
+					}
+				}
 				payload := the.skAlarmElimination(alarmInfoTemplate, level, detail)
 				the.OutKafka.Publish(the.Info.IoConfig.Out.Kafka.AlarmTopic, payload)
 				delete(the.historyStationAlarmMap, sid)