ref: v3变更,,同步v2.2508.4
This commit is contained in:
@@ -99,7 +99,8 @@ func (s AlarmController) Remove(c *gin.Context) {
|
||||
// PUT /clear
|
||||
func (s AlarmController) Clear(c *gin.Context) {
|
||||
var body struct {
|
||||
Ids []int64 `json:"ids" binding:"required"`
|
||||
CoreUID string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识
|
||||
Id int64 `json:"id" binding:"required"`
|
||||
}
|
||||
if err := c.ShouldBindBodyWithJSON(&body); err != nil {
|
||||
errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
|
||||
@@ -108,7 +109,12 @@ func (s AlarmController) Clear(c *gin.Context) {
|
||||
}
|
||||
|
||||
clearUser := reqctx.LoginUserToUserName(c)
|
||||
rows, err := s.alarmService.ClearByIds(body.Ids, clearUser, constants.ALARM_CLEAR_TYPE_MANUAL_CLEAR)
|
||||
rows, err := s.alarmService.ClearById(
|
||||
body.Id,
|
||||
body.CoreUID,
|
||||
clearUser,
|
||||
constants.ALARM_CLEAR_TYPE_MANUAL_CLEAR,
|
||||
)
|
||||
if err != nil {
|
||||
c.JSON(200, resp.ErrMsg(err.Error()))
|
||||
return
|
||||
@@ -121,8 +127,9 @@ func (s AlarmController) Clear(c *gin.Context) {
|
||||
// PUT /ack
|
||||
func (s AlarmController) Ack(c *gin.Context) {
|
||||
var body struct {
|
||||
Ids []int64 `json:"ids" binding:"required"`
|
||||
AckState bool `json:"ackState" binding:"omitempty"`
|
||||
CoreUID string `json:"coreUid" form:"coreUid" binding:"required"` // 核心网唯一标识
|
||||
Id int64 `json:"id" binding:"required"`
|
||||
AckState bool `json:"ackState" binding:"omitempty"`
|
||||
}
|
||||
if err := c.ShouldBindBodyWithJSON(&body); err != nil {
|
||||
errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
|
||||
@@ -131,7 +138,12 @@ func (s AlarmController) Ack(c *gin.Context) {
|
||||
}
|
||||
|
||||
ackUser := reqctx.LoginUserToUserName(c)
|
||||
rows, err := s.alarmService.AckByIds(body.Ids, ackUser, constants.ALARM_ACK_STATE_ACK)
|
||||
rows, err := s.alarmService.AckById(
|
||||
body.Id,
|
||||
body.CoreUID,
|
||||
ackUser,
|
||||
constants.ALARM_ACK_STATE_ACK,
|
||||
)
|
||||
if err != nil {
|
||||
c.JSON(200, resp.ErrMsg(err.Error()))
|
||||
return
|
||||
@@ -144,6 +156,7 @@ func (s AlarmController) Ack(c *gin.Context) {
|
||||
// GET /count/severity
|
||||
func (s AlarmController) CountSeverity(c *gin.Context) {
|
||||
var query struct {
|
||||
CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
|
||||
AlarmStatus string `json:"alarmStatus" form:"alarmStatus" binding:"required,oneof=Clear Active"` // 告警状态
|
||||
}
|
||||
if err := c.ShouldBindQuery(&query); err != nil {
|
||||
@@ -152,7 +165,7 @@ func (s AlarmController) CountSeverity(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
data := s.alarmService.CountSeverity(query.AlarmStatus)
|
||||
data := s.alarmService.CountSeverity(query.CoreUID, query.AlarmStatus)
|
||||
c.JSON(200, resp.OkData(data))
|
||||
}
|
||||
|
||||
@@ -161,6 +174,7 @@ func (s AlarmController) CountSeverity(c *gin.Context) {
|
||||
// GET /count/type
|
||||
func (s AlarmController) CountType(c *gin.Context) {
|
||||
var query struct {
|
||||
CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
|
||||
AlarmStatus string `json:"alarmStatus" form:"alarmStatus" binding:"required,oneof=Clear Active"` // 告警状态
|
||||
}
|
||||
if err := c.ShouldBindQuery(&query); err != nil {
|
||||
@@ -169,15 +183,16 @@ func (s AlarmController) CountType(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
data := s.alarmService.CountType(query.AlarmStatus)
|
||||
data := s.alarmService.CountType(query.CoreUID, query.AlarmStatus)
|
||||
c.JSON(200, resp.OkData(data))
|
||||
}
|
||||
|
||||
// 告警状态前几排名
|
||||
//
|
||||
// GET /count/ne
|
||||
func (s AlarmController) CountNe(c *gin.Context) {
|
||||
// GET /count/top
|
||||
func (s AlarmController) CountTop(c *gin.Context) {
|
||||
var query struct {
|
||||
CoreUID string `form:"coreUid" binding:"required"` // 核心网唯一标识
|
||||
AlarmStatus string `json:"alarmStatus" form:"alarmStatus" binding:"required,oneof=Clear Active"` // 告警状态
|
||||
Top int `json:"top" form:"top" binding:"required"` // 前几
|
||||
}
|
||||
@@ -187,7 +202,7 @@ func (s AlarmController) CountNe(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
data := s.alarmService.CountNe(query.AlarmStatus, query.Top)
|
||||
data := s.alarmService.CountNe(query.CoreUID, query.AlarmStatus, query.Top)
|
||||
c.JSON(200, resp.OkData(data))
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user