From f7114fffb2ee0cdbba3d9579c9ce40b28714a1cb Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 27 Jun 2025 19:18:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=91=8A=E8=AD=A6=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E8=BD=AC=E5=8F=91=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 features/fm/alarm.go | 2 +-
 features/fm/email.go | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/features/fm/alarm.go b/features/fm/alarm.go
index c854691d..e1ba0135 100644
--- a/features/fm/alarm.go
+++ b/features/fm/alarm.go
@@ -475,7 +475,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 		}
 
 		if config.GetYamlConfig().Alarm.EmailForward.Enable {
-			alarmData.EventTime = eventTimeGMT
+			alarmData.AckUser = eventTimeGMT
 			if err = AlarmEmailForward(&alarmData); err != nil {
 				log.Error("Failed to AlarmEmailForward:", err)
 			}
diff --git a/features/fm/email.go b/features/fm/email.go
index 0599ab00..8c0febf2 100644
--- a/features/fm/email.go
+++ b/features/fm/email.go
@@ -4,11 +4,9 @@ import (
 	"crypto/tls"
 	"fmt"
 	"strings"
-	"time"
 
 	"be.ems/lib/config"
 	"be.ems/lib/dborm"
-	"be.ems/lib/global"
 	"be.ems/lib/log"
 	neService "be.ems/src/modules/network_element/service"
 
@@ -38,7 +36,7 @@ func AlarmEmailForward(alarmData *Alarm) error {
 		<p style="text-indent:1.5em">Event Time: %s</p>
 		<p style="text-indent:0.5em">Alarm Status: %s</p>
 	<p>Automatic sent by OMC, please do not reply!</p>
-	`, alarmData.AlarmSeq, alarmData.NeName, neInfo.IP, alarmData.AlarmTitle, alarmData.OrigSeverity, alarmData.EventTime, alarmStatus)
+	`, alarmData.AlarmSeq, alarmData.NeName, neInfo.IP, alarmData.AlarmTitle, alarmData.OrigSeverity, alarmData.AckUser, alarmStatus)
 
 	// message := fmt.Sprintf(`
 	// Alarm information
@@ -80,14 +78,14 @@ func AlarmEmailForward(alarmData *Alarm) error {
 	// 	return err
 	// }
 	emails := strings.Split(config.GetYamlConfig().Alarm.EmailForward.EmailList, ",")
-	eventTime := global.GetFmtTimeString(time.RFC3339, alarmData.EventTime, time.DateTime)
 	forwardLog := &dborm.AlarmForwardLog{
 		NeType:     alarmData.NeType,
 		NeID:       alarmData.NeId,
 		AlarmID:    alarmData.AlarmId,
 		AlarmTitle: alarmData.AlarmTitle,
 		AlarmSeq:   alarmData.AlarmSeq,
-		EventTime:  eventTime,
+		EventTime:  alarmData.EventTime,
+		Interface:  "Email",
 		ToUser:     config.GetYamlConfig().Alarm.EmailForward.EmailList,
 	}