fix:预警增加指标名称

models/edb_monitor/edb_monitor.go

@@ -50,6 +50,13 @@ func GetEdbMonitorLevelList() (list []string, err error) {
 	return
 }
 
+func GetEdbMonitorEdbInfoList() (items []*EdbMonitorInfo, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := `SELECT * FROM edb_monitor_info WHERE state <> 0`
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
 func DeleteEdbMonitorInfoById(id int) (err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := `DELETE FROM edb_monitor_info WHERE edb_monitor_id =?`

models/edb_monitor/response/edb_monitor.go

@@ -10,6 +10,7 @@ type EdbMonitorInfoItem struct {
 	EdbMonitorClassifyName string  `description:"预警分类名称"`
 	EdbMonitorName         string  `description:"预警名称"`
 	EdbInfoId              int     `description:"指标id"`
+	EdbInfoName            string  `description:"指标名称"`
 	EdbInfoType            int     `description:"指标类型"`
 	EdbCode                string  `description:"指标编码"`
 	Source                 int     `description:"指标来源" json:"-"`

services/edb_monitor/edb_monitor.go

@@ -98,9 +98,20 @@ func GetMonitorList(classifyId, level, state, userId string, pageSize, currentIn
 		err = fmt.Errorf("GetEdbMonitorInfoPageByCondition err:%w", err)
 		return
 	}
-	edbUserId := make([]int, 0)
+	var edbInfoId, edbUserId []int
 	for _, v := range edbMonitorList {
 		edbUserId = append(edbUserId, v.CreateUserId)
+		edbInfoId = append(edbInfoId, v.EdbInfoId)
+	}
+	edbInfoList, err := data_manage.GetEdbInfoByIdList(edbInfoId)
+	if err != nil {
+		msg = "获取监控列表失败"
+		err = fmt.Errorf("GetEdbInfoByIdList err:%w", err)
+		return
+	}
+	infoMap := make(map[int]string)
+	for _, v := range edbInfoList {
+		infoMap[v.EdbInfoId] = v.EdbName
 	}
 	userInfoList, err := system.GetSysAdminByIdList(edbUserId)
 	if err != nil {
@@ -139,7 +150,7 @@ func GetMonitorList(classifyId, level, state, userId string, pageSize, currentIn
 		classifyPathMap[v.ClassifyId] = strings.Join(path, "/")
 	}
 
-	edbMonitorItems := toEdbMonitorInfoItems(edbMonitorList, userMap, classifyPathMap)
+	edbMonitorItems := toEdbMonitorInfoItems(edbMonitorList, userMap, classifyPathMap, infoMap)
 	page := paging.GetPaging(currentIndex, pageSize, total)
 
 	resp.List = edbMonitorItems
@@ -274,6 +285,8 @@ func ModifyEdbMonitorState(edbMonitorInfo *edbmonitor.EdbMonitorInfo, edbCode st
 	if err != nil {
 		return
 	}
+	if triggerState == EDB_MONITOR_STATE_TRIGGER_SUCCESS {
+	}
 	return
 }
 
@@ -402,7 +415,7 @@ func GetEdbMonitorInfoUserList() (resp response.EdbMonitorInfoCreateUserResp, ms
 	return
 }
 
-func toEdbMonitorInfoItems(edbmonitor []*edbmonitor.EdbMonitorInfo, userMap map[int]string, classifyPathMap map[int]string) []*response.EdbMonitorInfoItem {
+func toEdbMonitorInfoItems(edbmonitor []*edbmonitor.EdbMonitorInfo, userMap, classifyPathMap, infoMap map[int]string) []*response.EdbMonitorInfoItem {
 	res := make([]*response.EdbMonitorInfoItem, 0, len(edbmonitor))
 	for _, v := range edbmonitor {
 		tmp := new(response.EdbMonitorInfoItem)
@@ -411,6 +424,7 @@ func toEdbMonitorInfoItems(edbmonitor []*edbmonitor.EdbMonitorInfo, userMap map[
 		tmp.EdbMonitorClassifyId = v.EdbMonitorClassifyId
 		tmp.EdbMonitorClassifyName = classifyPathMap[v.EdbMonitorClassifyId]
 		tmp.EdbInfoId = v.EdbInfoId
+		tmp.EdbInfoName = infoMap[v.EdbInfoId]
 		tmp.EdbInfoType = v.EdbInfoType
 		tmp.EdbCode = v.EdbCode
 		tmp.Source = v.Source