OMC/nbi_alarm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

文件服务

Browse Source
This commit is contained in:
TsMask
2023-08-24 17:01:39 +08:00
parent c444e9f4fa
commit 98ad90cab7
2 changed files with 45 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
handle/service/sysn_alarm_file.go
View File

@@ -7,7 +7,6 @@ import (
"errors"
"omc/core"
"omc/core/db"
"omc/core/emun"
"omc/core/file"
"omc/handle/model"
"time"
@@ -17,7 +16,7 @@ import (
var AckSyncAlarmFileResultMsgID uint32 = 9
func GenFile(request ziface.IRequest, meta *file.FileMeta, data []OmcAlarm) {
func GenFile(request ziface.IRequest, meta *file.FileMeta, data []model.OmcAlarm) {
//生成文件内容
dataBuff := bytes.NewBuffer([]byte{})
for _, v := range data {
@@ -43,38 +42,14 @@ func GenFile(request ziface.IRequest, meta *file.FileMeta, data []OmcAlarm) {
}
// GetAlarmOfAlarmSeq 获取告警信息
func GetAlarmOfAlarmSeq(neType, neId string, alarmSeq int) ([]OmcAlarm, error) {
func GetAlarmOfAlarmSeq(neType, neId string, alarmSeq int) ([]model.OmcAlarm, error) {
var alarms []model.Alarm
var result []OmcAlarm
query := db.Client.Model(&model.Alarm{}).Where("ne_type = ? and ne_id = ? and alarm_seq > ?", neType, neId, alarmSeq)
if err := query.Order("alarm_seq asc").Find(&alarms).Error; err != nil {
return nil, err
}
for _, v := range alarms {
var item OmcAlarm
item.AlarmSeq = int32(v.AlarmSeq)
item.AlarmTitle = v.AlarmTitle
item.AlarmStatus = int32(v.AlarmStatus)
item.AlarmType = v.AlarmType
item.OrigSeverity = emun.OrigSeverity(v.OrigSeverity)
item.EventTime = v.EventTime.Format("2006-01-02 15:04:05")
item.AlarmId = v.AlarmId
item.SpecificProblemID = v.SpecificProblemID
item.SpecificProblem = v.SpecificProblem
item.NeUID = v.NeId
item.NeName = v.NeName
item.NeType = v.NeType
item.ObjectUID = v.ObjectUID
item.ObjectName = v.NeName
item.ObjectType = v.ObjectType
item.LocationInfo = v.LocationInfo
item.AddInfo = v.AddInfo
item.PVFlag = v.PVFlag
item.Province = v.Province
result = append(result, item)
}
return result, nil
return ConvertOMCAlarm(alarms), nil
}
//GetAlarm
@@ -86,7 +61,7 @@ func GetAlarmOfAlarmSeq(neType, neId string, alarmSeq int) ([]OmcAlarm, error) {
*/
func GetAlarm(neType, neId, startTime, endTime, syncSource string, alarmSeq int) ([]OmcAlarm, error) {
func GetAlarm(neType, neId, startTime, endTime, syncSource string, alarmSeq int) ([]model.OmcAlarm, error) {
if syncSource == "0" {
return GetAlarmOfEventTime(neType, neId, startTime, endTime)
@@ -100,9 +75,9 @@ func GetAlarm(neType, neId, startTime, endTime, syncSource string, alarmSeq int)
}
// GetAlarmOfEventTime 获取告警信息
func GetAlarmOfEventTime(neType, neId, startTime, endTime string) ([]OmcAlarm, error) {
func GetAlarmOfEventTime(neType, neId, startTime, endTime string) ([]model.OmcAlarm, error) {
var alarms []model.Alarm
var result []OmcAlarm
var result []model.OmcAlarm
if startTime == "" && endTime == "" {
return result, nil
@@ -125,39 +100,16 @@ func GetAlarmOfEventTime(neType, neId, startTime, endTime string) ([]OmcAlarm, e
if err := query.Order("alarm_seq asc").Find(&alarms).Error; err != nil {
return nil, err
}
for _, v := range alarms {
var item OmcAlarm
item.AlarmSeq = int32(v.AlarmSeq)
item.AlarmTitle = v.AlarmTitle
item.AlarmStatus = int32(v.AlarmStatus)
item.AlarmType = v.AlarmType
item.OrigSeverity = emun.OrigSeverity(v.OrigSeverity)
item.EventTime = v.EventTime.Format("2006-01-02 15:04:05")
item.AlarmId = v.AlarmId
item.SpecificProblemID = v.SpecificProblemID
item.SpecificProblem = v.SpecificProblem
item.NeUID = v.NeId
item.NeName = v.NeName
item.NeType = v.NeType
item.ObjectUID = v.ObjectUID
item.ObjectName = v.NeName
item.ObjectType = v.ObjectType
item.LocationInfo = v.LocationInfo
item.AddInfo = v.AddInfo
item.PVFlag = v.PVFlag
item.Province = v.Province
result = append(result, item)
}
return result, nil
return ConvertOMCAlarm(alarms), nil
}
// GetAlarmOfLog 获取告警信息
func GetAlarmOfLog(neType, neId, startTime, endTime string) ([]OmcAlarm, error) {
func GetAlarmOfLog(neType, neId, startTime, endTime string) ([]model.OmcAlarm, error) {
var alarms []model.Alarm
var result []OmcAlarm
if startTime == "" && endTime == "" {
return result, nil
return []model.OmcAlarm{}, nil
}
var aIDs []int64
query := db.Client.Model(&model.NbiAlarmLog{}).Select("distinct a_id").Where("ne_type = ? and ne_id = ?", neType, neId)
@@ -182,28 +134,6 @@ func GetAlarmOfLog(neType, neId, startTime, endTime string) ([]OmcAlarm, error)
if err := db.Client.Model(&model.Alarm{}).Where("id in (?)", aIDs).Find(&alarms).Error; err != nil {
return nil, err
}
for _, v := range alarms {
var item OmcAlarm
item.AlarmSeq = int32(v.AlarmSeq)
item.AlarmTitle = v.AlarmTitle
item.AlarmStatus = int32(v.AlarmStatus)
item.AlarmType = v.AlarmType
item.OrigSeverity = emun.OrigSeverity(v.OrigSeverity)
item.EventTime = v.EventTime.Format("2006-01-02 15:04:05")
item.AlarmId = v.AlarmId
item.SpecificProblemID = v.SpecificProblemID
item.SpecificProblem = v.SpecificProblem
item.NeUID = v.NeId
item.NeName = v.NeName
item.NeType = v.NeType
item.ObjectUID = v.ObjectUID
item.ObjectName = v.NeName
item.ObjectType = v.ObjectType
item.LocationInfo = v.LocationInfo
item.AddInfo = v.AddInfo
item.PVFlag = v.PVFlag
item.Province = v.Province
result = append(result, item)
}
return result, nil
return ConvertOMCAlarm(alarms), nil
}