From e98330371e72127945f974eaddef9d53a1a74f2b Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 10 九月 2019 18:06:31 +0800
Subject: [PATCH] update call compare
---
labelFilter/ruleForLabel.go | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index 3bc1592..df28b40 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -45,19 +45,19 @@
for _, rule := range ruleGroup.Rules {
// 杩囨瘡涓�涓皬瑙勫垯
if rule.TopicType == "camera" {
- result = Connector + cameraJudge(label, rule)
+ result += Connector + cameraJudge(label, rule)
}
if rule.TopicType == "dbtable" {
- result = Connector + baseJudge(label, rule)
+ result += Connector + baseJudge(label, rule)
}
if rule.TopicType == "task" {
- result = Connector + taskJudge(label, rule)
+ result += Connector + taskJudge(label, rule)
}
if rule.TopicType == "person" {
- result = Connector + taskJudge(label, rule)
+ result += Connector + taskJudge(label, rule)
}
if rule.TopicType == "alarmLevel" {
- result = Connector + defenceJudge(label, rule)
+ result += Connector + defenceJudge(label, rule)
}
}
// 寰楀嚭鎬荤殑鍒ゆ柇缁撴灉
@@ -67,6 +67,7 @@
expression, err := govaluate.NewEvaluableExpression(result);
if err != nil {
logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒")
+ return
}
result, err1 := expression.Evaluate(nil)
if err1 != nil {
@@ -107,6 +108,7 @@
expression, err := govaluate.NewEvaluableExpression("t1 < t2");
if err != nil {
logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒")
+ return false
}
parameters := make(map[string]interface{}, 8)
parameters["t1"] = time1
@@ -167,7 +169,7 @@
logger.Info("-------鎵撳嵃搴曞簱瑙勫垯鍏紡锛�",formula)
if err != nil {
logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula)
- //return "false"
+ return "false"
}
result, err1 := expression.Evaluate(nil)
if err1 != nil {
@@ -208,7 +210,7 @@
expression, err := govaluate.NewEvaluableExpression(formula);
if err != nil {
logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula)
- //return "false"
+ return "false"
}
result, err1 := expression.Evaluate(nil)
if err1 != nil {
@@ -232,7 +234,7 @@
expression, err := govaluate.NewEvaluableExpression(formula);
if err != nil {
logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula)
- //return "false"
+ return "false"
}
result, err1 := expression.Evaluate(nil)
if err1 != nil {
@@ -264,12 +266,12 @@
}
} else {
for _, def := range label.DefenceLevel {
- formula := strconv.Itoa(int(def)) + rule.Operator + formate(rule.RuleValue)
+ formula := strconv.Itoa(int(def)) + rule.Operator + rule.RuleValue
logger.Info("-------鎵撳嵃甯冮槻绛夌骇瑙勫垯鍏紡锛�",formula)
expression, err := govaluate.NewEvaluableExpression(formula);
if err != nil {
logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒", formula)
- //return "false"
+ return "false"
}
result, err1 := expression.Evaluate(nil)
if err1 != nil {
--
Gitblit v1.8.0