merge: 合并OMC分支

features/fm/alarm.go

@@ -15,9 +15,6 @@ import (
 	"nms_cxy/lib/log"
 	"nms_cxy/lib/services"
 	"nms_cxy/omc/config"
-	"nms_cxy/src/framework/utils/date"
-	neDataModel "nms_cxy/src/modules/network_data/model"
-	nmsCXYService "nms_cxy/src/modules/nms_cxy/service"
 
 	"xorm.io/xorm"
 
@@ -155,9 +152,9 @@ type DatabaseClient struct {
 
 var DbClient DatabaseClient
 
-func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) error {
-	DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=true&loc=Local",
-		dbUser, dbPassword, dbHost, dbPort, dbName)
+func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName, dbParam string) error {
+	DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?%s",
+		dbUser, dbPassword, dbHost, dbPort, dbName, dbParam)
 	DbClient.dbType = dbType
 	DbClient.dbConnMaxLifetime = 0
 	DbClient.dbMaxIdleConns = 0
@@ -165,8 +162,7 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) err
 	if log.GetLevel() == log.LOG_TRACE {
 		DbClient.IsShowSQL = true
 	}
-	log.Debugf("dbType:%s dbUrl:%s:******@tcp(%s:%s)/%s??charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=true&loc=Local",
-		dbType, dbUser, dbHost, dbPort, dbName)
+	log.Debugf("dbType:%s dbUrl:%s:", dbType, DbClient.dbUrl)
 
 	var err error
 	DbClient.XEngine, err = xorm.NewEngine(DbClient.dbType, DbClient.dbUrl)
@@ -177,6 +173,8 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) err
 	DbClient.XEngine.SetConnMaxLifetime(DbClient.dbConnMaxLifetime)
 	DbClient.XEngine.SetMaxIdleConns(DbClient.dbMaxIdleConns)
 	DbClient.XEngine.SetMaxOpenConns(DbClient.dbMaxOpenConns)
+	DbClient.XEngine.DatabaseTZ = time.Local // 必须
+	DbClient.XEngine.TZLocation = time.Local // 必须
 	if DbClient.IsShowSQL {
 		DbClient.XEngine.ShowSQL(true)
 	}
@@ -287,9 +285,6 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 					services.ResponseInternalServerError500DatabaseOperationFailed(w)
 					continue
 				}
-
-				//
-				pushKafka(alarmData)
 			} else {
 				affected, err := session.Where("ne_type=? and ne_id=? and alarm_id=? and alarm_status=1", alarmData.NeType, alarmData.NeId, alarmData.AlarmId).
 					Cols("alarm_status", "clear_type", "clear_time").
@@ -299,9 +294,6 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 					services.ResponseInternalServerError500DatabaseOperationFailed(w)
 					continue
 				}
-
-				//
-				pushKafka(alarmData)
 			}
 			log.Trace("alarmData:", alarmData)
 			var currentSeq string
@@ -444,11 +436,20 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 				SetAlarmAckInfo(valueJson, &alarmData)
 			}
 			log.Debug("alarmData:", alarmData)
-			affected, err := session.Insert(alarmData)
-			if err != nil && affected <= 0 {
-				log.Error("Failed to insert alarm data:", err)
-				services.ResponseInternalServerError500DatabaseOperationFailed(w)
-				continue
+			if alarmData.OrigSeverity == "Event" && config.GetYamlConfig().Alarm.SplitEventAlarm {
+				affected, err := xEngine.Table("alarm_event").InsertOne(alarmData)
+				if err != nil && affected <= 0 {
+					log.Error("Failed to insert alarm_event:", err)
+					services.ResponseInternalServerError500ProcessError(w, err)
+					continue
+				}
+			} else {
+				affected, err := session.Insert(alarmData)
+				if err != nil && affected <= 0 {
+					log.Error("Failed to insert alarm data:", err)
+					services.ResponseInternalServerError500DatabaseOperationFailed(w)
+					continue
+				}
 			}
 			alarmLog := new(AlarmLog)
 			alarmLog.NeType = alarmData.NeType
@@ -460,21 +461,18 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 			alarmLog.EventTime = eventTime
 			log.Trace("alarmLog:", alarmLog)
 
-			affected, err = session.Insert(alarmLog)
+			affected, err := session.Insert(alarmLog)
 			if err != nil && affected <= 0 {
 				log.Error("Failed to insert alarm_log:", err)
 			}
 			session.Commit()
-
-			//
-			pushKafka(alarmData)
 		}
 		if config.GetYamlConfig().Alarm.ForwardAlarm {
 			if err = AlarmEmailForward(&alarmData); err != nil {
 				log.Error("Failed to AlarmEmailForward:", err)
 			}
-			if err = AlarmForwardBySMSC(&alarmData); err != nil {
-				log.Error("Failed to AlarmForwardBySMSC:", err)
+			if err = AlarmSMSForward(&alarmData); err != nil {
+				log.Error("Failed to AlarmSMSForward:", err)
 			}
 		}
 	}
@@ -482,25 +480,26 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 	services.ResponseStatusOK200Null(w)
 }
 
-// pushKafka 告警推送kafka
-func pushKafka(alarmData Alarm) {
-	neAlarm := neDataModel.Alarm{
-		AlarmSeq:        fmt.Sprint(alarmData.AlarmSeq),
-		AlarmTitle:      alarmData.AlarmTitle,
-		AlarmStatus:     fmt.Sprint(alarmData.AlarmStatus),
-		AlarmType:       alarmData.AlarmType,
-		OrigSeverity:    alarmData.OrigSeverity,
-		EventTime:       date.ParseStrToDate(alarmData.EventTime, date.YYYY_MM_DD_HH_MM_SS),
-		ID:              alarmData.AlarmId,
-		AlarmCode:       fmt.Sprint(alarmData.AlarmCode),
-		SpecificProblem: alarmData.SpecificProblem,
-		ObjectUid:       alarmData.ObjectUid,
-		NeName:          alarmData.NeName,
-		AlarmId:         alarmData.ObjectUid,
-		ObjectName:      alarmData.ObjectName,
-		AddInfo:         alarmData.AddInfo,
-	}
-	nmsCXYService.NewAlarmImpl.KafkaPush(neAlarm)
+type AlarmEvent struct {
+	AlarmSeq          int    `json:"alarmSeq"`
+	AlarmId           string `json:"alarmId" xorm:"alarm_id"`
+	NeId              string `json:"neId"`
+	AlarmCode         int    `json:"alarmCode"`
+	AlarmTitle        string `json:"alarmTitle"`
+	EventTime         string `json:"eventTime"`
+	AlarmType         string `json:"alarmType"`
+	OrigSeverity      string `json:"origSeverity"`
+	PVFlag            string `json:"pvFlag" xorm:"pv_flag"`
+	NeName            string `json:"neName"`
+	NeType            string `json:"neType"`
+	ObjectUid         string `json:"objectUid" xorm:"object_uid"`
+	ObjectName        string `json:"objectName" xorm:"object_name"`
+	ObjectType        string `json:"objectType" xorm:"object_type"`
+	LocationInfo      string `json:"locationInfo"`
+	Province          string `json:"province"`
+	SpecificProblem   string `json:"specificProblem"`
+	SpecificProblemID string `json:"specificProblemID" xorm:"specific_problem_id"`
+	AddInfo           string `json:"addInfo"`
 }
 
 // process alarm get from NFs
@@ -768,8 +767,8 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 						if err = AlarmEmailForward(&alarmData); err != nil {
 							log.Error("Failed to AlarmEmailForward:", err)
 						}
-						if err = AlarmForwardBySMSC(&alarmData); err != nil {
-							log.Error("Failed to AlarmForwardBySMSC:", err)
+						if err = AlarmSMSForward(&alarmData); err != nil {
+							log.Error("Failed to AlarmSMSForward:", err)
 						}
 					}
 				}

features/fm/smsforward.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
+	"strings"
 	"time"
 
 	"nms_cxy/lib/dborm"
@@ -16,7 +17,24 @@ import (
 	"github.com/linxGnu/gosmpp/pdu"
 )
 
-func AlarmForwardBySMS(alarmData *Alarm) error {
+func AlarmSMSForward(alarmData *Alarm) error {
+	switch config.GetYamlConfig().Alarm.SMProxy {
+	case "sms":
+		users, err := AlarmForwardBySMS(alarmData)
+		writeLog(alarmData, users, "SMS", err)
+		return err
+	case "smsc":
+		users, err := AlarmForwardBySMPP(alarmData)
+		writeLog(alarmData, users, "SMS", err)
+		return err
+	default:
+		users, err := AlarmForwardBySMPP(alarmData)
+		writeLog(alarmData, users, "SMS", err)
+		return err
+	}
+}
+
+func AlarmForwardBySMS(alarmData *Alarm) (string, error) {
 	log.Info("AlarmForwardBySMS processing... ")
 
 	SMSFforwardconfig := config.GetYamlConfig().Alarm.SMS
@@ -30,91 +48,74 @@ func AlarmForwardBySMS(alarmData *Alarm) error {
 	toUsers, err := dborm.XormGetAlarmForward("SMS")
 	if err != nil {
 		log.Error("Failed to XormGetAlarmForward:", err)
-		return err
+		return "", err
 	} else if toUsers == nil {
 		err := errors.New("not found forward phone number")
 		log.Error(err)
-		return err
+		return "", err
+	}
+	userList := strings.Join(*toUsers, ",")
+
+	// 短信相关参数
+	params := url.Values{}
+	params.Set("PhoneNumbers", userList)
+	params.Set("SignName", SMSFforwardconfig.SignName)
+	params.Set("TemplateCode", SMSFforwardconfig.TemplateCode)
+	params.Set("TemplateParam", `{"message":"alarm"}`)
+
+	// 构建请求URL
+	reqURL := apiURL + "?Action=SendSms&" + params.Encode()
+
+	// 创建HTTP请求
+	req, err := http.NewRequest("GET", reqURL, nil)
+	if err != nil {
+		log.Error("Failed to create request:", err)
+		return userList, err
 	}
 
-	for _, toUser := range *toUsers {
-		// 短信相关参数
-		params := url.Values{}
-		params.Set("PhoneNumbers", toUser)
-		params.Set("SignName", SMSFforwardconfig.SignName)
-		params.Set("TemplateCode", SMSFforwardconfig.TemplateCode)
-		params.Set("TemplateParam", `{"message":"alarm"}`)
+	// 添加请求头部
+	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	req.Header.Set("Authorization", "APPCODE "+accessKeySecret)
 
-		// 构建请求URL
-		reqURL := apiURL + "?Action=SendSms&" + params.Encode()
-
-		// 创建HTTP请求
-		req, err := http.NewRequest("GET", reqURL, nil)
-		if err != nil {
-			log.Error("Failed to create request:", err)
-			return err
-		}
-
-		// 添加请求头部
-		req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-		req.Header.Set("Authorization", "APPCODE "+accessKeySecret)
-
-		forwardLog := &dborm.AlarmForwardLog{
-			NeType:     alarmData.NeType,
-			NeID:       alarmData.NeId,
-			AlarmID:    alarmData.AlarmId,
-			AlarmTitle: alarmData.AlarmTitle,
-			AlarmSeq:   alarmData.AlarmSeq,
-			EventTime:  alarmData.EventTime,
-			ToUser:     toUser,
-		}
-		// 发送请求
-		client := &http.Client{}
-		resp, err := client.Do(req)
-		if err != nil {
-			operResult := fmt.Sprintf("Failed to send request:%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)
-			}
-			continue
-		}
-		defer resp.Body.Close()
-
-		// 解析响应
-		if resp.StatusCode == http.StatusOK {
-			operResult := "SMS sent successfully!"
-			log.Info(operResult)
-			forwardLog.OperResult = operResult
-			affected, err := dborm.XormInsertAlarmForwardLog(forwardLog)
-			if err != nil && affected <= 0 {
-				log.Error("Failed to insert data:", err)
-				continue
-			}
-		} else {
-			operResult := fmt.Sprintf("Failed to send SMS, StatusCode=%d", resp.StatusCode)
-			log.Error(operResult)
-			forwardLog.OperResult = operResult
-			affected, err := dborm.XormInsertAlarmForwardLog(forwardLog)
-			if err != nil && affected <= 0 {
-				log.Error("Failed to insert data:", err)
-				continue
-			}
-		}
+	// 发送请求
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		log.Error("Failed to send request:%v", err)
+		return userList, err
+	}
+	defer resp.Body.Close()
+
+	// 解析响应
+	switch resp.StatusCode {
+	case http.StatusOK, http.StatusAccepted, http.StatusNoContent, http.StatusCreated:
+		return userList, nil
+	default:
+		err := fmt.Errorf("Failed to send SMS: %s(Code=%d)", resp.Status, resp.StatusCode)
+		log.Error(err)
+		return userList, err
 	}
-	return nil
 }
 
-func AlarmForwardBySMPP(alarmData *Alarm) error {
+func AlarmForwardBySMPP(alarmData *Alarm) (string, error) {
 	log.Info("AlarmForwardBySMPP processing... ")
 
+	toUsers, err := dborm.XormGetAlarmForward("SMS")
+	if err != nil {
+		log.Error("Failed to XormGetAlarmForward:", err)
+		return "", err
+	} else if toUsers == nil {
+		err := errors.New("not found forward phone number")
+		log.Error(err)
+		return "", err
+	}
+	userList := strings.Join(*toUsers, ",")
+
 	auth := gosmpp.Auth{
 		SMSC:       config.GetYamlConfig().Alarm.SMSC.Addr,
-		SystemID:   config.GetYamlConfig().Alarm.SMSC.UserName,
+		SystemID:   config.GetYamlConfig().Alarm.SMSC.SystemID,
 		Password:   config.GetYamlConfig().Alarm.SMSC.Password,
-		SystemType: "",
+		SystemType: config.GetYamlConfig().Alarm.SMSC.SystemType,
 	}
 
 	// conn, err := gosmpp.NonTLSDialer(auth.SMSC)
@@ -142,49 +143,50 @@ func AlarmForwardBySMPP(alarmData *Alarm) error {
 			},
 		}, -1)
 	if err != nil {
-		log.Error(err)
-		return err
+		log.Error("Failed to create SMPP new session:", err)
+		return userList, err
 	}
 	defer func() {
 		_ = trans.Close()
 	}()
 
-	toUsers, err := dborm.XormGetAlarmForward("SMS")
-	if err != nil {
-		log.Error("Failed to XormGetAlarmForward:", err)
-		return err
-	} else if toUsers == nil {
-		err := errors.New("not found forward phone number")
-		log.Error(err)
-		return err
-	}
 	// sending SMS(s)
-	for _, toUser := range *toUsers {
-		forwardLog := &dborm.AlarmForwardLog{
-			NeType:     alarmData.NeType,
-			NeID:       alarmData.NeId,
-			AlarmID:    alarmData.AlarmId,
-			AlarmTitle: alarmData.AlarmTitle,
-			AlarmSeq:   alarmData.AlarmSeq,
-			EventTime:  alarmData.EventTime,
-			ToUser:     toUser,
-		}
-		message := alarmData.AlarmTitle + "from" + alarmData.NeType + alarmData.NeId + "at" + alarmData.EventTime
-		if err = trans.Transceiver().Submit(newSubmitSM(toUser, message)); err != nil {
-			operResult := fmt.Sprintf("Failed to submit short message:%v", err)
-			log.Error(operResult)
-			forwardLog.OperResult = operResult
-		} else {
-			operResult := "SMS sent successfully!"
-			log.Trace(operResult)
-			forwardLog.OperResult = operResult
-		}
+	// var results []string
+	// for _, toUser := range *toUsers {
+	message := "Alarm Notification: " + alarmData.AlarmTitle + " from " + alarmData.NeType + " " + alarmData.NeId + " at " + alarmData.EventTime
+	if err = trans.Transceiver().Submit(newSubmitSM(userList, message)); err != nil {
+		// result := fmt.Sprintf("Failed to submit %s hort message:%s", toUser, err.Error())
+		// results = append(results, result)
+		log.Error("Failed to submit hort message:", err)
+		return userList, err
+	}
+	// }
+	return userList, nil
+}
 
-		affected, err := dborm.XormInsertAlarmForwardLog(forwardLog)
-		if err != nil && affected <= 0 {
-			log.Error("Failed to insert data:", err)
-			continue
-		}
+func writeLog(alarmData *Alarm, toUser, forwardBy string, err error) error {
+	var result string
+	if err == nil {
+		result = "SMS sent successfully"
+	} else {
+		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,
+	}
+
+	affected, err := dborm.XormInsertAlarmForwardLog(forwardLog)
+	if err != nil && affected <= 0 {
+		log.Error("Failed to insert data:", err)
+		return err
 	}
 	return nil
 }

features/fm/ucpcli.go

@@ -1,61 +0,0 @@
-package fm
-
-import (
-	"fmt"
-	"strings"
-
-	"nms_cxy/lib/log"
-	"nms_cxy/omc/config"
-
-	"github.com/chzyer/readline"
-	"github.com/go-gsm/ucp"
-)
-
-func AlarmForwardBySMSC(alarmData *Alarm) error {
-	opt := &ucp.Options{
-		Addr:       config.GetYamlConfig().Alarm.SMSC.Addr,
-		User:       config.GetYamlConfig().Alarm.SMSC.UserName,
-		Password:   config.GetYamlConfig().Alarm.SMSC.Password,
-		AccessCode: "",
-	}
-
-	client := ucp.New(opt)
-	if err := client.Connect(); err != nil {
-		log.Error("Failed to connect:", err)
-		return err
-	}
-	defer client.Close()
-
-	reader, _ := readline.New(">>> ")
-	defer reader.Close()
-
-	for {
-		fmt.Print(">>> ")
-		lines, _ := reader.Readline()
-		fields := strings.Fields(lines)
-
-		if len(fields) == 1 {
-			// exit CLI
-			if fields[0] == "exit" {
-				return nil
-			}
-			// display help message
-			if fields[0] == "help" {
-				log.Trace("\n\tSend a 'message' to 'receiver' with a 'sender' mask\n\t>>> sender receiver message\n\n\tExit the cli\n\t>>> exit\n")
-			}
-		}
-
-		// sender receiver message...
-		if len(fields) >= 3 {
-			sender := fields[0]
-			receiver := fields[1]
-			message := strings.Join(fields[2:], " ")
-			ids, err := client.Send(sender, receiver, message)
-			if err != nil {
-				log.Error(err)
-			} else {
-				log.Debug("%v", ids)
-			}
-		}
-	}
-}