From 05efb91c8e0494ef96ff84e90b924c4baa13b75a Mon Sep 17 00:00:00 2001 From: panlei <2799247126@qq.com> Date: 星期四, 08 八月 2019 10:30:46 +0800 Subject: [PATCH] --- --- labelFilter/ruleForLabel.go | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go index 1adf9ce..3bc1592 100644 --- a/labelFilter/ruleForLabel.go +++ b/labelFilter/ruleForLabel.go @@ -127,6 +127,7 @@ if rule.TopicArg == "addr" { formula = "'" + label.CameraAddr + "'" + rule.Operator + "'" + rule.RuleValue + "'" } + logger.Info("-------鎵撳嵃鎽勫儚鏈鸿鍒欏叕寮忥細",formula) expression, err := govaluate.NewEvaluableExpression(formula); if err != nil { logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula) @@ -163,6 +164,7 @@ for _, liker := range arg.Liker { formula := "'" + liker.TableId + "'" + rule.Operator + "'" + rule.RuleValue + "'" expression, err := govaluate.NewEvaluableExpression(formula); + logger.Info("-------鎵撳嵃搴曞簱瑙勫垯鍏紡锛�",formula) if err != nil { logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula) //return "false" @@ -202,6 +204,7 @@ // 鍏朵粬杩欎釜鍊煎厛杩欎箞澶勭悊 return "true" } + logger.Info("-------鎵撳嵃浜哄憳瑙勫垯鍏紡锛�",formula) expression, err := govaluate.NewEvaluableExpression(formula); if err != nil { logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula) @@ -225,6 +228,7 @@ } } else { formula := strconv.Itoa(int(personGroup.AlarmLevel)) + rule.Operator + formate(rule.RuleValue) + logger.Info("-------鎵撳嵃浜哄憳绛夌骇瑙勫垯鍏紡锛�",formula) expression, err := govaluate.NewEvaluableExpression(formula); if err != nil { logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula) @@ -261,6 +265,7 @@ } else { for _, def := range label.DefenceLevel { formula := strconv.Itoa(int(def)) + rule.Operator + formate(rule.RuleValue) + logger.Info("-------鎵撳嵃甯冮槻绛夌骇瑙勫垯鍏紡锛�",formula) expression, err := govaluate.NewEvaluableExpression(formula); if err != nil { logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula) @@ -285,6 +290,7 @@ func taskJudge(label *Label, rule *protomsg.EventPushRule) string { formula := "'"+label.TaskId +"'"+ rule.Operator +"'"+ rule.RuleValue+"'" expression, err := govaluate.NewEvaluableExpression(formula); + logger.Info("-------鎵撳嵃浠诲姟瑙勫垯鍏紡锛�",formula) if err != nil { logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula) return "false" -- Gitblit v1.8.0