fix:修复消息信息，关闭health路由

controllers/edb_monitor/edb_monitor_message.go

@@ -98,7 +98,7 @@ func (m *EdbMonitorMessageController) Connect() {
 	go func() {
 		defer close(success)
 		for _, msg := range messageList {
-			err = edbmonitor.SendMessages(sysUser.AdminId, msg.EdbInfoId, msg.EdbInfoType, msg.Message, msg.TriggerTime)
+			err = edbmonitor.SendMessages(sysUser.AdminId, msg.EdbInfoId, msg.EdbInfoType, msg.EdbClassifyId, msg.EdbUniqueCode, msg.Message, msg.TriggerTime)
 			if err != nil {
 				utils.FileLog.Error("指标预警信息发送失败,err:%s, adminId:%d", err.Error(), sysUser.AdminId)
 			} else {
@@ -130,46 +130,6 @@ func (m *EdbMonitorMessageController) Connect() {
 	}
 }
 
-// Health
-// @Title 预警管理消息
-// @Description 预警管理消息
-// @Param   request body request.EdbMonitorSaveRequest  true  "每页数据条数"
-// @Success 200 {object} models.EnglishReportEmailPageListResp
-// @router /message/health [post]
-func (m *EdbMonitorMessageController) Health() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		m.Data["json"] = br
-		m.ServeJSON()
-	}()
-	sysUser := m.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	conn := edbmonitor.MonitorMessageConn[sysUser.AdminId]
-	if conn == nil {
-		br.Msg = "系统错误"
-		br.ErrMsg = "健康检查失败,err:连接已断开"
-		return
-	}
-
-	healthKey := edbmonitor.EDB_MONITOR_MESSAGE_CONNECT_CACHE + strconv.Itoa(sysUser.AdminId)
-	err := utils.Rc.Put(healthKey, "1", time.Minute*3)
-	if err != nil {
-		br.Msg = "系统错误"
-		br.ErrMsg = "健康检查失败,err:" + err.Error()
-		return
-	}
-
-	br.Msg = "成功"
-	br.Ret = 200
-	br.Success = true
-}
-
 // Close
 // @Title 预警管理消息
 // @Description 预警管理消息

models/edb_monitor/response/edb_monitor_message.go

@@ -6,6 +6,8 @@ type EdbMonitorMessageResp struct {
 	EdbMonitorMessageId int    `description:"消息id"`
 	EdbInfoId           int    `description:"指标id"`
 	EdbInfoType         int    `description:"指标类型:0-普通指标；1-预测指标"`
+	EdbUniqueCode       string `description:"指标唯一标识"`
+	EdbClassifyId       int    `description:"指标id"`
 	IsRead              int    `description:"是否已读:0-未读；1-已读"`
 	Message             string `description:"消息内容"`
 	TriggerTime         string `description:"触发时间"`

routers/commentsRouter.go

@@ -6604,15 +6604,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_api/controllers/edb_monitor:EdbMonitorMessageController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/edb_monitor:EdbMonitorMessageController"],
-        beego.ControllerComments{
-            Method: "Health",
-            Router: `/message/health`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_api/controllers/edb_monitor:EdbMonitorMessageController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/edb_monitor:EdbMonitorMessageController"],
         beego.ControllerComments{
             Method: "List",

services/edb_monitor/edb_monitor.go

@@ -297,7 +297,7 @@ func ModifyEdbMonitorState(edbMonitorInfo *edbmonitor.EdbMonitorInfo, edbCode st
 
 	if triggerState == EDB_MONITOR_STATE_TRIGGER_SUCCESS {
 		triggerTime := edbMonitorInfo.MonitorTriggerTime.Format(utils.FormatDateTime)
-		err = SendMessages(edbMonitorInfo.CreateUserId, edbMonitorInfo.EdbInfoId, edbMonitorInfo.EdbInfoType, edbMonitorInfo.EdbMonitorName, triggerTime)
+		err = SendMessages(edbMonitorInfo.CreateUserId, edbMonitorInfo.EdbInfoId, edbMonitorInfo.EdbInfoType, edbMonitorInfo.EdbMonitorClassifyId, edbMonitorInfo.EdbUniqueCode, edbMonitorInfo.EdbMonitorName, triggerTime)
 		isRead := 1
 		if err != nil {
 			isRead = 0

services/edb_monitor/edb_monitor_message.go

@@ -81,16 +81,18 @@ func LogMessage(content, uniqueCode string, triggerTime time.Time, edbInfoId, ed
 	return err
 }
 
-func SendMessages(adminId int, edbInfoId int, edbInfoType int, message string, triggerTime string) (err error) {
+func SendMessages(adminId, edbInfoId, edbInfoType int, classifyId int, edbUniqueCode, message string, triggerTime string) (err error) {
 	conn := MonitorMessageConn[adminId]
 	if conn == nil {
 		return errors.New("no connection")
 	}
 	msg := response.EdbMonitorMessageResp{
-		EdbInfoId:   edbInfoId,
-		EdbInfoType: edbInfoType,
-		Message:     message,
-		TriggerTime: triggerTime,
+		EdbInfoId:     edbInfoId,
+		EdbInfoType:   edbInfoType,
+		EdbUniqueCode: edbUniqueCode,
+		EdbClassifyId: classifyId,
+		Message:       message,
+		TriggerTime:   triggerTime,
 	}
 	return conn.WriteJSON(msg)
 }
@@ -135,6 +137,8 @@ func toEdbMonitorMessageResp(items []*edbmonitor.EdbMonitorMessage) (list []*res
 			EdbMonitorMessageId: message.EdbMonitorMessageId,
 			EdbInfoId:           message.EdbInfoId,
 			EdbInfoType:         message.EdbInfoType,
+			EdbUniqueCode:       message.EdbUniqueCode,
+			EdbClassifyId:       message.EdbClassifyId,
 			IsRead:              message.IsRead,
 			Message:             message.Message,
 			TriggerTime:         utils.TimeTransferString(utils.FormatDateTime, message.MonitorTriggerTime),