diff --git a/features/fm/alarm.go b/features/fm/alarm.go index 886745b1..c72b054c 100644 --- a/features/fm/alarm.go +++ b/features/fm/alarm.go @@ -253,7 +253,7 @@ func origSeverityValue(str string) string { return str } -// alarmNew 清除告警 +// alarmClear 清除告警 func alarmClear(neInfo neModel.NeInfo, v Alarm) (neDataModel.Alarm, error) { alarmService := neDataService.NewAlarm // 检查网元告警ID是否唯一 diff --git a/src/framework/constants/alarm.go b/src/framework/constants/alarm.go new file mode 100644 index 00000000..e07f5067 --- /dev/null +++ b/src/framework/constants/alarm.go @@ -0,0 +1,9 @@ +package constants + +// 告警 alarmCode 常量 +const ( + // ALARM_STATE_CHECK 告警-状态检查 + ALARM_STATE_CHECK = 10000 + // ALARM_EVENT_REBOOT 事件-网元重启 + ALARM_EVENT_REBOOT = 9000 +) diff --git a/src/framework/constants/upload_sub_path.go b/src/framework/constants/upload_sub_path.go index a8bdf1b3..3963ad24 100644 --- a/src/framework/constants/upload_sub_path.go +++ b/src/framework/constants/upload_sub_path.go @@ -16,6 +16,10 @@ const ( UPLOAD_DOWNLOAD = "download" // UPLOAD_CHUNK 切片 UPLOAD_CHUNK = "chunk" + // UPLOAD_SOFTWARE 软件包 + UPLOAD_SOFTWARE = "software" + // UPLOAD_LICENSE 授权文件 + UPLOAD_LICENSE = "license" ) // UPLOAD_SUB_PATH 子路径类型映射 @@ -27,4 +31,6 @@ var UPLOAD_SUB_PATH = map[string]string{ UPLOAD_COMMON: "通用上传", UPLOAD_DOWNLOAD: "下载", UPLOAD_CHUNK: "切片", + UPLOAD_SOFTWARE: "软件包", + UPLOAD_LICENSE: "授权文件", } diff --git a/src/framework/resp/api.go b/src/framework/resp/api.go index c5b0815d..2b21a861 100644 --- a/src/framework/resp/api.go +++ b/src/framework/resp/api.go @@ -17,68 +17,50 @@ const ( MSG_ENCRYPT = "encrypt" ) +// Resp 响应结构体 +type Resp struct { + Code int `json:"code,omitempty"` // 响应状态码 + Msg string `json:"msg,omitempty"` // 响应信息 + Data any `json:"data,omitempty"` // 响应数据 +} + // CodeMsg 响应结果 -func CodeMsg(code int, msg string) map[string]any { - args := make(map[string]any) - args["code"] = code - args["msg"] = msg - return args +func CodeMsg(code int, msg string) Resp { + return Resp{Code: code, Msg: msg} } // Ok 响应成功结果 -func Ok(v map[string]any) map[string]any { - args := make(map[string]any) - args["code"] = CODE_SUCCESS - args["msg"] = MSG_SUCCCESS - // v合并到args - for key, value := range v { - args[key] = value +func Ok(v map[string]any) Resp { + if v == nil { + return Resp{Code: CODE_SUCCESS, Msg: MSG_SUCCCESS} } - return args + return Resp{Code: CODE_SUCCESS, Msg: MSG_SUCCCESS, Data: v} } // OkMsg 响应成功结果信息 -func OkMsg(msg string) map[string]any { - args := make(map[string]any) - args["code"] = CODE_SUCCESS - args["msg"] = msg - return args +func OkMsg(msg string) Resp { + return Resp{Code: CODE_SUCCESS, Msg: msg} } // OkData 响应成功结果数据 -func OkData(data any) map[string]any { - args := make(map[string]any) - args["code"] = CODE_SUCCESS - args["msg"] = MSG_SUCCCESS - args["data"] = data - return args +func OkData(data any) Resp { + return Resp{Code: CODE_SUCCESS, Msg: MSG_SUCCCESS, Data: data} } // Err 响应失败结果 map[string]any{} -func Err(v map[string]any) map[string]any { - args := make(map[string]any) - args["code"] = CODE_ERROR - args["msg"] = MSG_ERROR - // v合并到args - for key, value := range v { - args[key] = value +func Err(v map[string]any) Resp { + if v == nil { + return Resp{Code: CODE_ERROR, Msg: MSG_ERROR} } - return args + return Resp{Code: CODE_ERROR, Msg: MSG_ERROR, Data: v} } // ErrMsg 响应失败结果信息 -func ErrMsg(msg string) map[string]any { - args := make(map[string]any) - args["code"] = CODE_ERROR - args["msg"] = msg - return args +func ErrMsg(msg string) Resp { + return Resp{Code: CODE_ERROR, Msg: msg} } // ErrData 响应失败结果数据 -func ErrData(data any) map[string]any { - args := make(map[string]any) - args["code"] = CODE_ERROR - args["msg"] = MSG_ERROR - args["data"] = data - return args +func ErrData(data any) Resp { + return Resp{Code: CODE_ERROR, Msg: MSG_ERROR, Data: data} }