From 1eed96e9b0925286e256c1a8263b7b80d1902aac Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Wed, 6 Sep 2023 11:23:09 +0800
Subject: [PATCH] alarm_id

---
 config/etc/default/tasks.yaml |  8 ++++----
 crontask/db.go                |  2 +-
 crontask/etc/tasks.yaml       |  2 +-
 crontask/tasks.go             | 10 +++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/config/etc/default/tasks.yaml b/config/etc/default/tasks.yaml
index f0e65616..3db4153d 100644
--- a/config/etc/default/tasks.yaml
+++ b/config/etc/default/tasks.yaml
@@ -102,7 +102,7 @@ tasks:
   - name: Task of Generate measure threshold alarm
     status: Active
     uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms  
-    params: RJHXEMSPM10200
+    params: 10200
     interval: 10
     unit: Seconds
     at: 
@@ -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: 00:30
@@ -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/db.go b/crontask/db.go
index cdb3c4d1..d1f1927c 100644
--- a/crontask/db.go
+++ b/crontask/db.go
@@ -253,7 +253,7 @@ type MeasureThreshold struct {
 	Threshold    int64  `json:"threshold" xorm:"threshold"`
 	Status       string `json:"status" xorm:"Status"`
 	OrigSeverity string `json:"origSeverity" xorm:"orig_severity"`
-	AlarmId      string `json:"alarmId" xorm:"alarm_id"`
+	AlarmCode    string `json:"alarmCode" xorm:"alarm_code"`
 	AlarmFlag    bool   `json:"alarmFlag" xorm:"alarm_flag"`
 }
 
diff --git a/crontask/etc/tasks.yaml b/crontask/etc/tasks.yaml
index 626d97f4..0e8e5b0b 100644
--- a/crontask/etc/tasks.yaml
+++ b/crontask/etc/tasks.yaml
@@ -102,7 +102,7 @@ tasks:
   - name: Task of Generate measure threshold alarm
     status: Inactive
     uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms  
-    params: RJHXEMSPM10200
+    params: 10200
     interval: 10
     unit: Seconds
     at: 
diff --git a/crontask/tasks.go b/crontask/tasks.go
index 14e40825..ba2acbc5 100644
--- a/crontask/tasks.go
+++ b/crontask/tasks.go
@@ -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=%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,
@@ -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,