diff --git a/crontask/etc/crontask.yaml b/crontask/etc/crontask.yaml index 6ada995b..5f242f77 100644 --- a/crontask/etc/crontask.yaml +++ b/crontask/etc/crontask.yaml @@ -22,7 +22,7 @@ database: type: mysql user: root password: 1000omc@kp! - host: 172.25.97.150 + host: 127.0.0.1 port: 33066 name: omc_db backup: d:/local.git/ems.agt/restagent/database diff --git a/crontask/tasks.go b/crontask/tasks.go index ba2acbc5..8242f21b 100644 --- a/crontask/tasks.go +++ b/crontask/tasks.go @@ -515,7 +515,6 @@ func (t *TaskFunc) TaskImportCmToNF(uri, params, body string) { default: log.Error("response code:", response.StatusCode()) } - return } func (t *TaskFunc) TaskGenMeasureThresholdAlarm(uri, params, body string) { @@ -1012,7 +1011,7 @@ func (t *TaskFunc) TaskGenLicenseAlarm(uri, params, body string) { locationInfo := fmt.Sprintf("CM.License: expiry date=%s,threshold=%v", expiryDate, alarmDefine.Threshold) alarmData := &Alarm{ AlarmSeq: alarmSeq, - AlarmId: params, + AlarmId: alarmDefine.AlarmId, NeId: ne.RmUID, NeType: ne.NeType, NeName: ne.NeName, @@ -1074,7 +1073,7 @@ func (t *TaskFunc) TaskGenLicenseAlarm(uri, params, body string) { locationInfo := fmt.Sprintf("CM.License: expiry date=%s,threshold=%v", expiryDate, alarmDefine.Threshold) alarmData := &Alarm{ AlarmSeq: alarmSeq, - AlarmId: params, + AlarmId: alarmDefine.AlarmId, NeId: ne.RmUID, NeType: ne.NeType, NeName: ne.NeName, @@ -1199,7 +1198,7 @@ func (t *TaskFunc) TaskGenNeStateAlarm(uri, params, body string) { locationInfo := fmt.Sprintf("SystemManagement.State: NE heartbeat timestamp=%s,threshold=%v", timestamp, alarmDefine.Threshold) alarmData := &Alarm{ AlarmSeq: alarmSeq, - AlarmId: params, + AlarmId: alarmDefine.AlarmId, NeId: ne.RmUID, NeType: ne.NeType, NeName: ne.NeName, @@ -1261,7 +1260,7 @@ func (t *TaskFunc) TaskGenNeStateAlarm(uri, params, body string) { locationInfo := fmt.Sprintf("SystemManagement.State: NE heartbeat timestamp=%s,threshold=%v", timestamp, alarmDefine.Threshold) alarmData := &Alarm{ AlarmSeq: alarmSeq, - AlarmId: params, + AlarmId: alarmDefine.AlarmId, NeId: ne.RmUID, NeType: ne.NeType, NeName: ne.NeName,