From ee6d3c869ac19b842bb9b87926d2c9808143d3b4 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 05 八月 2019 15:52:15 +0800
Subject: [PATCH] 改造试点摄像机和任务判断

---
 labelFilter/ruleForLabel.go |   46 ++++++++++++++++++++++++++++++----------------
 1 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index 5301818..2b31dcf 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -114,25 +114,28 @@
 
 // 鏄惁绗﹀悎鎽勫儚鏈鸿鍒�
 func cameraJudge(label *Label,rule *protomsg.EventPushRule) string{
+	formula := ""
 	if rule.TopicArg == "cameraName" {
-		if label.CameraName == rule.RuleValue {
-			logger.Info("绗﹀悎鎽勫儚鏈哄悕绉拌鍒�")
-			return "true"
-		} else {
-			logger.Info("涓嶇鍚堟憚鍍忔満鍚嶇О瑙勫垯")
-			return "false"
-		}
+		formula = label.CameraName + rule.Operator + rule.RuleValue
 	}
 	if rule.TopicArg == "cameraLocation" {
-		if label.CameraAddr == rule.RuleValue {
-			logger.Info("绗﹀悎鎽勫儚鏈轰綅缃鍒�")
-			return "true"
-		} else {
-			logger.Info("涓嶇鍚堟憚鍍忔満浣嶇疆瑙勫垯")
-			return "false"
-		}
+		formula = label.CameraAddr + rule.Operator + rule.RuleValue
 	}
-	return ""
+	expression, err:= govaluate.NewEvaluableExpression(formula);
+	if err != nil {
+		logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒")
+		return "false"
+	}
+	result, err1:= expression.Evaluate(nil)
+	if err1 != nil {
+		logger.Error("甯﹀叆鍙傛暟鏈夎")
+		return "false"
+	}
+	if result.(bool) {
+		logger.Info("绗﹀悎鎽勫儚鏈鸿鍒�!")
+		return "true"
+	}
+	return "false"
 }
 
 // 鏄惁绗﹀悎搴曞簱瑙勫垯
@@ -194,7 +197,18 @@
 }
 // 鏄惁绗﹀悎浠诲姟瑙勫垯
 func taskJudge(label *Label,rule *protomsg.EventPushRule) string{
-	if label.TaskId == rule.RuleValue {
+	formula := label.TaskId + rule.Operator + rule.RuleValue
+	expression, err:= govaluate.NewEvaluableExpression(formula);
+	if err != nil {
+		logger.Error("琛ㄨ揪寮忔湁璇紝璇锋鏌ワ紒")
+		return "false"
+	}
+	result, err1:= expression.Evaluate(nil)
+	if err1 != nil {
+		logger.Error("甯﹀叆鍙傛暟鏈夎")
+		return "false"
+	}
+	if result.(bool) {
 		logger.Info("绗﹀悎浠诲姟瑙勫垯!")
 		return "true"
 	}

--
Gitblit v1.8.0