OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

alarm

Browse Source
This commit is contained in:
simonzhangsz
2023-09-06 10:59:13 +08:00
parent 9a65ee4f5d
commit f4216a6e76
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crontask/db.go
View File

@@ -348,12 +348,12 @@ type AlarmDefine struct {
Status string `json:"status" xorm:"status"` Status string `json:"status" xorm:"status"`
} }
func XormGetAlarmDefine(alarmId string) (*AlarmDefine, error) { func XormGetAlarmDefine(alarmCode string) (*AlarmDefine, error) {
log.Debug("XormGetAlarmDefine processing... ") log.Debug("XormGetAlarmDefine processing... ")
alarmDefine := new(AlarmDefine) alarmDefine := new(AlarmDefine)
_, err := dbClient.xEngine. _, err := dbClient.xEngine.
Where("alarm_id=? and status='Active'", alarmId). Where("alarm_code=? and status='Active'", alarmCode).
Get(alarmDefine) Get(alarmDefine)
if err != nil { if err != nil {
log.Error("Failed to get table alarm_define from database:", err) log.Error("Failed to get table alarm_define from database:", err)

6
crontask/etc/tasks.yaml
View File

@@ -110,7 +110,7 @@ tasks:
- name: Task of Generate license alarm - name: Task of Generate license alarm
status: Inactive status: Inactive
uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms
params: RJHXEMSCM10100 params: 10100 #alarm_code
interval: 1 interval: 1
unit: Days unit: Days
at: 20:01 at: 20:01
@@ -118,7 +118,7 @@ tasks:
- name: Task of Generate NE system state alarm - name: Task of Generate NE system state alarm
status: Active status: Active
uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms
params: RJHXEMSSM10000 params: 10000
interval: 5 interval: 5
unit: Seconds unit: Seconds
at: at:
@@ -126,7 +126,7 @@ tasks:
- name: Task of Generate Measure Report Timeout - name: Task of Generate Measure Report Timeout
status: Active status: Active
uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms
params: RJHXEMSPM10201 params: 10201
interval: 10 interval: 10
unit: Seconds unit: Seconds
at: at:

11
crontask/tasks.go
View File

@@ -770,11 +770,10 @@ func (t *TaskFunc) TaskGenMeasureReportTimeoutAlarm(uri, params, body string) {
} }
log.Debug("measureData:", measureData) log.Debug("measureData:", measureData)
var alarmId string = "RJHXEMSPM10201" if params == "" {
if params != "" { params = "10201"
alarmId = params
} }
alarmDefine, err := XormGetAlarmDefine(alarmId) alarmDefine, err := XormGetAlarmDefine(params)
if err != nil { if err != nil {
log.Error("Failed to get alarm_define:", err) log.Error("Failed to get alarm_define:", err)
continue continue
@@ -974,7 +973,7 @@ func (t *TaskFunc) TaskGenLicenseAlarm(uri, params, body string) {
} }
if params == "" { if params == "" {
params = "RJHXEMSCM10100" params = "10100"
} }
alarmDefine, err := XormGetAlarmDefine(params) alarmDefine, err := XormGetAlarmDefine(params)
if err != nil { if err != nil {
@@ -1151,7 +1150,7 @@ func (t *TaskFunc) TaskGenNeStateAlarm(uri, params, body string) {
log.Debug("neState:", *neState) log.Debug("neState:", *neState)
if params == "" { if params == "" {
params = "RJHXEMSSM10000" params = "10000"
} }
alarmDefine, err := XormGetAlarmDefine(params) alarmDefine, err := XormGetAlarmDefine(params)
if err != nil { if err != nil {