refactor: 重构更新多个文件中的相关调用

features/fm/email.go

@@ -6,7 +6,6 @@ import (
 	"strings"
 
 	"be.ems/lib/config"
-	"be.ems/lib/dborm"
 	"be.ems/lib/log"
 
 	"gopkg.in/gomail.v2"
@@ -66,16 +65,6 @@ func AlarmEmailForward(alarmData *Alarm) error {
 	// 	return err
 	// }
 	emails := strings.Split(config.GetYamlConfig().Alarm.EmailForward.EmailList, ",")
-	forwardLog := &dborm.AlarmForwardLog{
-		NeType:     alarmData.NeType,
-		NeID:       alarmData.NeId,
-		AlarmID:    alarmData.AlarmId,
-		AlarmTitle: alarmData.AlarmTitle,
-		AlarmSeq:   alarmData.AlarmSeq,
-		EventTime:  alarmData.EventTime,
-		ToUser:     config.GetYamlConfig().Alarm.EmailForward.EmailList,
-	}
-
 	m.SetHeader("To", emails...) // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接
 	//m.SetHeader("To", strings.Join(*emails, " ")) // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接
 	//m.SetHeader("To", "zhangshuzhong@agrandtech.com", "simonzhangsz@outlook.com") // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接
@@ -107,22 +96,6 @@ func AlarmEmailForward(alarmData *Alarm) error {
 		d.TLSConfig = &tls.Config{InsecureSkipVerify: false}
 	}
 
-	if err := d.DialAndSend(m); err != nil {
-		operResult := fmt.Sprintf("Failed to DialAndSend:%v", err)
-		log.Error(operResult)
-		forwardLog.OperResult = operResult
-		affected, err := dborm.XormInsertAlarmForwardLog(forwardLog)
-		if err != nil && affected <= 0 {
-			log.Error("Failed to insert data:", err)
-		}
-		return err
-	}
-
-	forwardLog.OperResult = "Email sent successfully!"
-	affected, err := dborm.XormInsertAlarmForwardLog(forwardLog)
-	if err != nil && affected <= 0 {
-		log.Error("Failed to insert data:", err)
-		return err
-	}
-	return nil
+	err := d.DialAndSend(m)
+	return writeLog(alarmData, config.GetYamlConfig().Alarm.EmailForward.EmailList, "EMAIL", err)
 }

features/fm/smsforward.go

@@ -11,6 +11,10 @@ import (
 	"be.ems/lib/config"
 	"be.ems/lib/dborm"
 	"be.ems/lib/log"
+	"be.ems/src/framework/utils/date"
+	neDataModel "be.ems/src/modules/network_data/model"
+	neDataService "be.ems/src/modules/network_data/service"
+	neService "be.ems/src/modules/network_element/service"
 	"github.com/linxGnu/gosmpp"
 	"github.com/linxGnu/gosmpp/data"
 	"github.com/linxGnu/gosmpp/pdu"
@@ -167,28 +171,31 @@ func AlarmForwardBySMPP(alarmData *Alarm) (string, error) {
 }
 
 func writeLog(alarmData *Alarm, toUser, forwardBy string, err error) error {
-	var result string
-	if err == nil {
-		result = "SMS sent successfully"
-	} else {
+	var result string = fmt.Sprintf("%s Sent Successfully!", forwardBy)
+	if err != nil {
 		result = err.Error()
 	}
-	forwardLog := &dborm.AlarmForwardLog{
-		NeType:     alarmData.NeType,
-		NeID:       alarmData.NeId,
-		AlarmID:    alarmData.AlarmId,
-		AlarmTitle: alarmData.AlarmTitle,
-		AlarmSeq:   alarmData.AlarmSeq,
-		EventTime:  alarmData.EventTime,
-		Interface:  forwardBy,
-		ToUser:     toUser,
-		OperResult: result,
+	neInfo := neService.NewNeInfo.FindByRmuid(alarmData.NeId)
+	eventTime := date.ParseStrToDate(alarmData.EventTime, date.YYYY_MM_DDTHH_MM_SSZ)
+	alarmForwardLog := neDataModel.AlarmForwardLog{
+		NeType:       neInfo.NeType,
+		NeId:         neInfo.NeId,
+		AlarmSeq:     int64(alarmData.AlarmSeq),
+		AlarmId:      alarmData.AlarmId,
+		AlarmTitle:   alarmData.AlarmTitle,
+		AlarmCode:    int64(alarmData.AlarmCode),
+		AlarmStatus:  fmt.Sprint(alarmData.AlarmStatus),
+		OrigSeverity: origSeverityValue(alarmData.OrigSeverity),
+		EventTime:    eventTime.UnixMilli(),
+		Type:         forwardBy,
+		Target:       toUser,
+		Result:       result,
 	}
 
-	affected, err := dborm.XormInsertAlarmForwardLog(forwardLog)
-	if err != nil && affected <= 0 {
-		log.Error("Failed to insert data:", err)
-		return err
+	// 记录日志
+	insertId := neDataService.NewAlarmForwardLog.Insert(alarmForwardLog)
+	if insertId <= 0 {
+		return fmt.Errorf("failed to insert data")
 	}
 	return nil
 }