From c165dbb634d3c8f3446d499c25894e8d61945c2d Mon Sep 17 00:00:00 2001 From: panlei <2799247126@qq.com> Date: 星期四, 24 十月 2019 11:52:41 +0800 Subject: [PATCH] 减少日志量外加放开标签过滤器 --- labelFilter/ruleForLabel.go | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go index 23b27da..ef2ca9f 100644 --- a/labelFilter/ruleForLabel.go +++ b/labelFilter/ruleForLabel.go @@ -14,7 +14,7 @@ // 瑁呴厤鎴愯嚜宸卞彲浠ヨ瘑鍒殑鏁版嵁 label := new(Label) label.DataFormatToLabel(msg) - logger.Info("label鐨勪俊鎭細", label.CameraName, label.DefenceLevel, label.Time) + //logger.Info("label鐨勪俊鎭細", label.CameraName, label.DefenceLevel, label.Time) if label.CameraName == "" { logger.Error("鏃犳晥鏁版嵁锛岀洿鎺ヨ繑鍥�") return @@ -22,7 +22,7 @@ //鎷垮埌鎵�鏈夎鍒欑粍 var api dbapi.EventPushApi b, allRules := api.FindAllDetails() - logger.Info("鏌ョ湅鎵�鏈夎鍒欑粍锛�", allRules) + //logger.Info("鏌ョ湅鎵�鏈夎鍒欑粍锛�", allRules) if !b { logger.Error("鏌ヨ鏃堕棿鎺ㄩ�佽鍒欏け璐ワ紒") } @@ -92,7 +92,7 @@ // 鏄惁绗﹀悎鏃堕棿瑙勫垯 func timeJudge(label *Label, groupRule protomsg.EventPush) bool { timeNow := time.Now().Format("2006-01-02 15:04:05") - logger.Info("鏍囩杩囨护鍣ㄨ捣濮嬫椂闂翠负锛�",groupRule.TimeStart,groupRule.TimeEnd) + //logger.Info("鏍囩杩囨护鍣ㄨ捣濮嬫椂闂翠负锛�",groupRule.TimeStart,groupRule.TimeEnd) flag1 := isBefore(groupRule.TimeStart, timeNow) flag2 := isBefore(timeNow, groupRule.TimeEnd) if flag1 && flag2 { @@ -129,7 +129,7 @@ if rule.TopicArg == "addr" { formula = "'" + label.CameraAddr + "'" + rule.Operator + "'" + rule.RuleValue + "'" } - logger.Info("-------鎵撳嵃鎽勫儚鏈鸿鍒欏叕寮忥細",formula) + //logger.Info("-------鎵撳嵃鎽勫儚鏈鸿鍒欏叕寮忥細",formula) expression, err := govaluate.NewEvaluableExpression(formula); if err != nil { logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula) @@ -144,7 +144,7 @@ logger.Info("绗﹀悎鎽勫儚鏈鸿鍒�!") return "true" } - logger.Info("涓嶇鍚堟憚鍍忔満瑙勫垯!") + //logger.Info("涓嶇鍚堟憚鍍忔満瑙勫垯!") return "false" } @@ -166,7 +166,7 @@ for _, liker := range arg.Liker { formula := "'" + liker.TableId + "'" + rule.Operator + "'" + rule.RuleValue + "'" expression, err := govaluate.NewEvaluableExpression(formula); - logger.Info("-------鎵撳嵃搴曞簱瑙勫垯鍏紡锛�",formula) + //logger.Info("-------鎵撳嵃搴曞簱瑙勫垯鍏紡锛�",formula) if err != nil { logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula) return "false" @@ -206,7 +206,7 @@ // 鍏朵粬杩欎釜鍊煎厛杩欎箞澶勭悊 return "true" } - logger.Info("-------鎵撳嵃浜哄憳瑙勫垯鍏紡锛�",formula) + //logger.Info("-------鎵撳嵃浜哄憳瑙勫垯鍏紡锛�",formula) expression, err := govaluate.NewEvaluableExpression(formula); if err != nil { logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula) @@ -230,7 +230,7 @@ } } else { formula := strconv.Itoa(int(personGroup.AlarmLevel)) + rule.Operator + formate(rule.RuleValue) - logger.Info("-------鎵撳嵃浜哄憳绛夌骇瑙勫垯鍏紡锛�",formula) + //logger.Info("-------鎵撳嵃浜哄憳绛夌骇瑙勫垯鍏紡锛�",formula) expression, err := govaluate.NewEvaluableExpression(formula); if err != nil { logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula) @@ -267,7 +267,7 @@ } else { for _, def := range label.DefenceLevel { formula := strconv.Itoa(int(def)) + rule.Operator + rule.RuleValue - logger.Info("-------鎵撳嵃甯冮槻绛夌骇瑙勫垯鍏紡锛�",formula) + //logger.Info("-------鎵撳嵃甯冮槻绛夌骇瑙勫垯鍏紡锛�",formula) expression, err := govaluate.NewEvaluableExpression(formula); if err != nil { logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula) @@ -292,7 +292,7 @@ func taskJudge(label *Label, rule *protomsg.EventPushRule) string { formula := "'"+label.TaskId +"'"+ rule.Operator +"'"+ rule.RuleValue+"'" expression, err := govaluate.NewEvaluableExpression(formula); - logger.Info("-------鎵撳嵃浠诲姟瑙勫垯鍏紡锛�",formula) + //logger.Info("-------鎵撳嵃浠诲姟瑙勫垯鍏紡锛�",formula) if err != nil { logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula) return "false" -- Gitblit v1.8.0