From f4216a6e76171c2555725dc4b26852ee34b5fab7 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Wed, 6 Sep 2023 10:59:13 +0800
Subject: [PATCH] alarm

---
 crontask/db.go          |  4 ++--
 crontask/etc/tasks.yaml |  6 +++---
 crontask/tasks.go       | 11 +++++------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/crontask/db.go b/crontask/db.go
index 74b9debc..cdb3c4d1 100644
--- a/crontask/db.go
+++ b/crontask/db.go
@@ -348,12 +348,12 @@ type AlarmDefine struct {
 	Status            string `json:"status" xorm:"status"`
 }
 
-func XormGetAlarmDefine(alarmId string) (*AlarmDefine, error) {
+func XormGetAlarmDefine(alarmCode string) (*AlarmDefine, error) {
 	log.Debug("XormGetAlarmDefine processing... ")
 
 	alarmDefine := new(AlarmDefine)
 	_, err := dbClient.xEngine.
-		Where("alarm_id=? and status='Active'", alarmId).
+		Where("alarm_code=? and status='Active'", alarmCode).
 		Get(alarmDefine)
 	if err != nil {
 		log.Error("Failed to get table alarm_define from database:", err)
diff --git a/crontask/etc/tasks.yaml b/crontask/etc/tasks.yaml
index 718daab7..626d97f4 100644
--- a/crontask/etc/tasks.yaml
+++ b/crontask/etc/tasks.yaml
@@ -110,7 +110,7 @@ tasks:
   - name: Task of Generate license alarm
     status: Inactive
     uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms
-    params: RJHXEMSCM10100
+    params: 10100          #alarm_code
     interval: 1
     unit: Days
     at: 20:01
@@ -118,7 +118,7 @@ tasks:
   - name: Task of Generate NE system state alarm
     status: Active
     uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms 
-    params: RJHXEMSSM10000
+    params: 10000
     interval: 5
     unit: Seconds
     at: 
@@ -126,7 +126,7 @@ tasks:
   - name: Task of Generate Measure Report Timeout
     status: Active
     uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms 
-    params: RJHXEMSPM10201
+    params: 10201
     interval: 10
     unit: Seconds
     at: 
diff --git a/crontask/tasks.go b/crontask/tasks.go
index b0f377c1..14e40825 100644
--- a/crontask/tasks.go
+++ b/crontask/tasks.go
@@ -770,11 +770,10 @@ func (t *TaskFunc) TaskGenMeasureReportTimeoutAlarm(uri, params, body string) {
 			}
 			log.Debug("measureData:", measureData)
 
-			var alarmId string = "RJHXEMSPM10201"
-			if params != "" {
-				alarmId = params
+			if params == "" {
+				params = "10201"
 			}
-			alarmDefine, err := XormGetAlarmDefine(alarmId)
+			alarmDefine, err := XormGetAlarmDefine(params)
 			if err != nil {
 				log.Error("Failed to get alarm_define:", err)
 				continue
@@ -974,7 +973,7 @@ func (t *TaskFunc) TaskGenLicenseAlarm(uri, params, body string) {
 		}
 
 		if params == "" {
-			params = "RJHXEMSCM10100"
+			params = "10100"
 		}
 		alarmDefine, err := XormGetAlarmDefine(params)
 		if err != nil {
@@ -1151,7 +1150,7 @@ func (t *TaskFunc) TaskGenNeStateAlarm(uri, params, body string) {
 		log.Debug("neState:", *neState)
 
 		if params == "" {
-			params = "RJHXEMSSM10000"
+			params = "10000"
 		}
 		alarmDefine, err := XormGetAlarmDefine(params)
 		if err != nil {