From 0eb4d66555bcd02fbe566d136b904f904dd2a45b Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 19 八月 2019 18:35:26 +0800
Subject: [PATCH] 提交中间件
---
labelFilter/ruleForLabel.go | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index 3bc1592..e2ad4ec 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -5,12 +5,12 @@
"basic.com/pubsub/protomsg.git"
"github.com/knetic/govaluate"
"ruleprocess/logger"
- "ruleprocess/ruleserver"
+ "ruleprocess/structure"
"strconv"
"time"
)
-func Judge(msg ruleserver.ResultMsg) {
+func Judge(msg structure.ResultMsg) {
// 瑁呴厤鎴愯嚜宸卞彲浠ヨ瘑鍒殑鏁版嵁
label := new(Label)
label.DataFormatToLabel(msg)
@@ -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 {
@@ -309,7 +311,7 @@
}
// 璋冪敤鐩爣鏈嶅姟鍣ㄧ殑鎻掑叆鎺ュ彛
-func pushData(urls []*protomsg.PushUrl, data ruleserver.ResultMsg) {
+func pushData(urls []*protomsg.PushUrl, data structure.ResultMsg) {
for _, url := range urls {
logger.Debug("鐪嬬湅鎺ㄩ�佸湴鍧�锛�",url.Url)
Push("tcp://192.168.1.123:40012", data)
--
Gitblit v1.8.0