# 修改输出格式

service/alarm/operator.go

 package alarm
 
 import (
+	"fmt"
 	"git.quantgroup.cn/DevOps/enoch/service/log"
 	"strconv"
-	"strings"
 )
 
 type Compare struct {
@@ -54,49 +54,29 @@ func parseToFloat(value string) float64 {
 type MsgBuilder struct {
 }
 
+
+
 func (MsgBuilder) Less(alter string, real string) string {
-	str := strings.Builder{}
-	str.WriteString("的值为：")
-	str.WriteString(real)
-	str.WriteString("已经低于阈值：")
-	str.WriteString(alter)
-	return str.String()
+	return fmt.Sprintf(" 当前值：%.3f, 低于阈值：%s",parseToFloat(real), alter)
 }
 
 /**
 	real > alter
  */
 func (MsgBuilder) Greater(alter string, real string) string {
-	str := strings.Builder{}
-	str.WriteString("的值为：")
-	str.WriteString(real)
-	str.WriteString("已经高于阈值：")
-	str.WriteString(alter)
-	return str.String()
+	return fmt.Sprintf(" 当前值：%.3f, 高于阈值：%s", parseToFloat(real), alter)
 }
 
 /**
 	real = alter
  */
 func (MsgBuilder) Equal(alter string, real string) string {
-	str := strings.Builder{}
-	str.WriteString("的值为：")
-	str.WriteString(real)
-	str.WriteString("已经达到阈值：")
-	str.WriteString(alter)
-	return str.String()
+	return fmt.Sprintf(" 当前值：%.3f, 等于阈值：%.3s", parseToFloat(real), alter)
 }
 
 func (MsgBuilder) Between(floor string, ceil string, real string) string {
-	str := strings.Builder{}
-	str.WriteString("的值为：")
-	str.WriteString(real)
-	str.WriteString("已经介于阈值：")
-	str.WriteString(ceil)
-	str.WriteString("~")
-	str.WriteString(floor)
-	str.WriteString("之间")
-	return str.String()
+	return fmt.Sprintf(" 当前值：%.3f, 介于于阈值：%s 和 %s 之间", parseToFloat(real), ceil, floor)
+
 }
 
 /**

service/alarm/query_engine.go

@@ -29,7 +29,7 @@ func DealResult(res []client.Result, strategies []Strategy) {
 			for _, series := range result.Series {
 				uniqueTag := series.Tags[tags[0]]
 				tagValues := getTagValues(tags, series.Tags)
-				if needIgnore(ignoreTag, tags) {
+				if needIgnore(ignoreTag, tagValues) {
 					continue
 				}
 				value := series.Values[0][1]
@@ -57,11 +57,11 @@ func DealResult(res []client.Result, strategies []Strategy) {
 			for i := 0; i < strategy.SqlLen; i++ {
 				resIndex += i
 				for _, series := range res[resIndex].Series {
-					if needIgnore(ignoreTag, tags) {
-						continue
-					}
 					uniqueTag := series.Tags[tags[0]]
 					tagValues := getTagValues(tags, series.Tags)
+					if needIgnore(ignoreTag, tagValues) {
+						continue
+					}
 					tagValueMap[uniqueTag] = tagValues
 					value := series.Values[0][1]
 
@@ -147,6 +147,7 @@ func hasNilValue(params []reflect.Value) bool {
 		return c.IsValid()
 	}
 	return false
+
 }
 
 func needIgnore(ignoreTag map[string]bool, tags []string) bool {