fix: 预警列表

src/bean/vo/request/alert.go

@@ -8,6 +8,17 @@ type DetailAlert struct {
 	Id int `json:"id" form:"id" binding:"required"`
 }
 
+type ListAlert struct {
+	Id        int    `json:"id" form:"id"`
+	Ids       []int  `json:"ids" form:"ids"`                                                 // 预警ids
+	RiskLevel int    `json:"risk_level" form:"risk_level" binding:"omitempty,oneof=1 2 3 4"` // 风险等级，1:低风险，2:一般风险，3:较大风险，4:重大风险
+	Status    int    `json:"status" form:"status" binding:"omitempty,oneof=1 2 3"`           // 状态，1:已恢复 2:未恢复 3:已关闭
+	Keyword   string `json:"keyword" form:"keyword"`                                         // 预警点/分类/指标
+	StartTime string `json:"start_time" form:"start_time" binding:"omitempty,datetime=2006-01-02 15:04:05"`
+	EndTime   string `json:"end_time" form:"end_time" binding:"omitempty,datetime=2006-01-02 15:04:05"`
+	Pagination
+}
+
 type UpdateAlert struct {
 	Id int `json:"id" form:"id" binding:"required"`
 	//Ids             []int  `json:"ids" form:"ids" binding:"required_without=Id"`                   // 预警ids
@@ -33,17 +44,6 @@ type BatchCloseAlert struct {
 	DeferPush   int    `json:"defer_push" form:"defer_push" binding:"omitempty,oneof=0 1"` // 延迟三天推送: 0:否 1:是 三天内将不再自动推送该告警信息给处置人员，可手动推送，但告警数据依然会出现
 }
 
-type ListAlert struct {
-	Id        int    `json:"id" form:"id"`
-	Ids       []int  `json:"ids" form:"ids" binding:"required_without=Id"`                   // 预警ids
-	RiskLevel int    `json:"risk_level" form:"risk_level" binding:"omitempty,oneof=1 2 3 4"` // 风险等级，1:低风险，2:一般风险，3:较大风险，4:重大风险
-	Status    int    `json:"status" form:"status" binding:"omitempty,oneof=1 2 3"`           // 状态，1:已恢复 2:未恢复 3:已关闭
-	Keyword   string `json:"keyword" form:"keyword"`                                         // 预警点/分类/指标
-	StartTime string `json:"start_time" form:"start_time" binding:"omitempty,datetime=2006-01-02 15:04:05"`
-	EndTime   string `json:"end_time" form:"end_time" binding:"omitempty,datetime=2006-01-02 15:04:05"`
-	Pagination
-}
-
 type DisposeAlert struct {
 	Id              int    `json:"id" form:"id" binding:"required"`
 	Status          int    `json:"status" form:"status" binding:"oneof=1 2"` // 状态，1:已恢复 2:未恢复 3:已关闭

src/controller/alert.go

@@ -8,47 +8,46 @@ import (
 	"gitlab.wodcloud.com/smart-operation/so-operation-api/src/service"
 )
 
-func UpdateAlert(c *gin.Context) {
-	var req request.UpdateAlert
+func DetailAlert(c *gin.Context) {
+	var req request.DetailAlert
 	if err := c.ShouldBind(&req); err != nil {
 		SendJsonResponse(c, resp.InvalidParam.TranslateError(err), nil)
 		return
 	}
 
 	svc := service.AlertSvc{User: header.GetUser(c)}
-	err := svc.Update(req)
+	data, err := svc.GetDataById(req)
 	if err != nil {
 		SendJsonResponse(c, resp.FAIL.WithError(err), nil)
 		return
 	}
-	SendJsonResponse(c, resp.OK, nil)
+	SendJsonResponse(c, resp.OK, data)
 }
 
-func BatchPushAlert(c *gin.Context) {
-	var req request.BatchPushAlert
+func ListAlert(c *gin.Context) {
+	var req request.ListAlert
 	if err := c.ShouldBind(&req); err != nil {
 		SendJsonResponse(c, resp.InvalidParam.TranslateError(err), nil)
 		return
 	}
-
 	svc := service.AlertSvc{User: header.GetUser(c)}
-	err := svc.BatchPushAlert(req)
+	data, err := svc.List(req)
 	if err != nil {
 		SendJsonResponse(c, resp.FAIL.WithError(err), nil)
 		return
 	}
-	SendJsonResponse(c, resp.OK, nil)
+	SendJsonResponse(c, resp.OK, data)
 }
 
-func BatchCloseAlert(c *gin.Context) {
-	var req request.BatchCloseAlert
+func UpdateAlert(c *gin.Context) {
+	var req request.UpdateAlert
 	if err := c.ShouldBind(&req); err != nil {
 		SendJsonResponse(c, resp.InvalidParam.TranslateError(err), nil)
 		return
 	}
 
 	svc := service.AlertSvc{User: header.GetUser(c)}
-	err := svc.BatchCloseAlert(req)
+	err := svc.Update(req)
 	if err != nil {
 		SendJsonResponse(c, resp.FAIL.WithError(err), nil)
 		return
@@ -56,35 +55,36 @@ func BatchCloseAlert(c *gin.Context) {
 	SendJsonResponse(c, resp.OK, nil)
 }
 
-func DetailAlert(c *gin.Context) {
-	var req request.DetailAlert
+func BatchPushAlert(c *gin.Context) {
+	var req request.BatchPushAlert
 	if err := c.ShouldBind(&req); err != nil {
 		SendJsonResponse(c, resp.InvalidParam.TranslateError(err), nil)
 		return
 	}
 
 	svc := service.AlertSvc{User: header.GetUser(c)}
-	data, err := svc.GetDataById(req)
+	err := svc.BatchPushAlert(req)
 	if err != nil {
 		SendJsonResponse(c, resp.FAIL.WithError(err), nil)
 		return
 	}
-	SendJsonResponse(c, resp.OK, data)
+	SendJsonResponse(c, resp.OK, nil)
 }
 
-func ListAlert(c *gin.Context) {
-	var req request.ListAlert
+func BatchCloseAlert(c *gin.Context) {
+	var req request.BatchCloseAlert
 	if err := c.ShouldBind(&req); err != nil {
 		SendJsonResponse(c, resp.InvalidParam.TranslateError(err), nil)
 		return
 	}
+
 	svc := service.AlertSvc{User: header.GetUser(c)}
-	data, err := svc.List(req)
+	err := svc.BatchCloseAlert(req)
 	if err != nil {
 		SendJsonResponse(c, resp.FAIL.WithError(err), nil)
 		return
 	}
-	SendJsonResponse(c, resp.OK, data)
+	SendJsonResponse(c, resp.OK, nil)
 }
 
 func DisposeAlert(c *gin.Context) {