This commit is contained in:
2023-09-06 11:23:09 +08:00
parent f8b25ef39a
commit 1eed96e9b0
4 changed files with 11 additions and 11 deletions

View File

@@ -538,7 +538,7 @@ func (t *TaskFunc) TaskGenMeasureThresholdAlarm(uri, params, body string) {
}
log.Debug("measureData:", measureData)
alarmDefine, err := XormGetAlarmDefine(m.AlarmId)
alarmDefine, err := XormGetAlarmDefine(m.AlarmCode)
if err != nil {
log.Error("Failed to get alarm_define:", err)
continue
@@ -585,7 +585,7 @@ func (t *TaskFunc) TaskGenMeasureThresholdAlarm(uri, params, body string) {
locationInfo := fmt.Sprintf("PM.%s: value=%v, threshold=%v", m.KpiSet, measureData.Value, m.Threshold)
alarmData := &Alarm{
AlarmSeq: alarmSeq,
AlarmId: m.AlarmId,
AlarmId: alarmDefine.AlarmId,
NeId: measureData.RmUid,
NeType: m.NeType,
NeName: measureData.NeName,
@@ -663,7 +663,7 @@ func (t *TaskFunc) TaskGenMeasureThresholdAlarm(uri, params, body string) {
locationInfo := fmt.Sprintf("PM.%s: value=%vthreshold=%v", m.KpiSet, measureData.Value, m.Threshold)
alarmData := &Alarm{
AlarmSeq: alarmSeq,
AlarmId: m.AlarmId,
AlarmId: alarmDefine.AlarmId,
NeId: measureData.RmUid,
NeType: m.NeType,
NeName: measureData.NeName,
@@ -834,7 +834,7 @@ func (t *TaskFunc) TaskGenMeasureReportTimeoutAlarm(uri, params, body string) {
alarmData := &Alarm{
AlarmSeq: alarmSeq,
AlarmId: alarmId,
AlarmId: alarmDefine.AlarmId,
NeId: neInfo.RmUID,
NeType: measureTask.NeType,
NeName: neInfo.NeName,
@@ -891,7 +891,7 @@ func (t *TaskFunc) TaskGenMeasureReportTimeoutAlarm(uri, params, body string) {
locationInfo := fmt.Sprintf("PM.taskId=%d: neType=%s, neId=%s", measureTask.Id, neInfo.NeType, neInfo.NeId)
alarmData := &Alarm{
AlarmSeq: alarmSeq,
AlarmId: alarmId,
AlarmId: alarmDefine.AlarmId,
NeId: neInfo.RmUID,
NeType: measureTask.NeType,
NeName: neInfo.NeName,