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

ref: v3变更,，同步v2.2508.4

Browse Source
This commit is contained in:
TsMask
2025-09-01 11:15:32 +08:00
parent 86dd22c274
commit 382bc311e6
198 changed files with 3768 additions and 3257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/notification/service/email.go
View File

@@ -14,11 +14,12 @@ import (
"be.ems/src/framework/logger"
"be.ems/src/framework/utils/date"
"be.ems/src/framework/utils/parse"
neModel "be.ems/src/modules/ne/model"
neDataModel "be.ems/src/modules/ne_data/model"
)
// EmailAlarm 发告警邮件
func EmailAlarm(a neDataModel.Alarm, neIP string) error {
func EmailAlarm(a neDataModel.Alarm, neInfo neModel.NeInfo) error {
emailList := fmt.Sprint(config.Get("notification.email.list"))
if len(emailList) == 0 {
return fmt.Errorf("email list is empty")
@@ -43,8 +44,8 @@ func EmailAlarm(a neDataModel.Alarm, neIP string) error {
// 参数值
data := map[string]any{
"AlarmSeq": a.AlarmSeq,
"NeName": a.NeName,
"NeIp": neIP,
"NeName": neInfo.NeName,
"NeIp": neInfo.IPAddr,
"AlarmTitle": a.AlarmTitle,
"OrigSeverity": a.OrigSeverity,
"AlarmTime": date.ParseDateToStr(a.EventTime, time.RFC3339),

9
src/modules/notification/service/smsc.go
View File

@@ -15,6 +15,7 @@ import (
"be.ems/src/framework/logger"
"be.ems/src/framework/utils/date"
"be.ems/src/framework/utils/parse"
neModel "be.ems/src/modules/ne/model"
neDataModel "be.ems/src/modules/ne_data/model"
)
@@ -90,7 +91,7 @@ func newSubmitSM(destSM string, message string) (*pdu.SubmitSM, error) {
}
// SMSCAlarm 发告警短信
func SMSCAlarm(a neDataModel.Alarm, neIP string) error {
func SMSCAlarm(a neDataModel.Alarm, neInfo neModel.NeInfo) error {
mobileList := fmt.Sprint(config.Get("notification.smsc.list"))
if len(mobileList) == 0 {
return fmt.Errorf("smsc list is empty")
@@ -100,7 +101,7 @@ func SMSCAlarm(a neDataModel.Alarm, neIP string) error {
textBodyTemplate := `Alarm Notification
Sequence: {{.AlarmSeq}},
NE Name: {{.NeName}}
NE IP: {{.NeIp}}
NE IP: {{.NeIPAddr}}
Title: {{.AlarmTitle}}
Severity: {{.OrigSeverity}}
Event Time: {{.AlarmTime}}
@@ -113,8 +114,8 @@ func SMSCAlarm(a neDataModel.Alarm, neIP string) error {
// 参数值
data := map[string]any{
"AlarmSeq": a.AlarmSeq,
"NeName": a.NeName,
"NeIp": neIP,
"NeName": neInfo.NeName,
"NeIPAddr": neInfo.IPAddr,
"AlarmTitle": a.AlarmTitle,
"OrigSeverity": a.OrigSeverity,
"AlarmTime": date.ParseDateToStr(a.EventTime, time.RFC3339),