From 52ea408f8ab6d4098a6c3b77042929fe34f10a09 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 06 八月 2019 18:07:38 +0800
Subject: [PATCH] ---
---
labelFilter/ruleForLabel.go | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index 3588c9c..6c5acfa 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -44,7 +44,7 @@
if rule.TopicType == "camera" {
result = Connector + cameraJudge(label,rule)
}
- if rule.TopicType == "baseLibrary" {
+ if rule.TopicType == "dbtable" {
result = Connector + baseJudge(label,rule)
}
if rule.TopicType == "task" {
@@ -53,7 +53,7 @@
if rule.TopicType == "person" {
result = Connector + taskJudge(label,rule)
}
- if rule.TopicType == "defence" {
+ if rule.TopicType == "alarmLevel" {
result = Connector + defenceJudge(label,rule)
}
}
@@ -115,10 +115,10 @@
// 鏄惁绗﹀悎鎽勫儚鏈鸿鍒�
func cameraJudge(label *Label,rule *protomsg.EventPushRule) string{
formula := ""
- if rule.TopicArg == "cameraName" {
+ if rule.TopicArg == "name" {
formula = label.CameraName + rule.Operator + rule.RuleValue
}
- if rule.TopicArg == "cameraLocation" {
+ if rule.TopicArg == "addr" {
formula = label.CameraAddr + rule.Operator + rule.RuleValue
}
expression, err:= govaluate.NewEvaluableExpression(formula);
@@ -186,13 +186,11 @@
}
if rule.TopicArg == "race"{
formula = strconv.Itoa(int(person.ThftRes.Race)) + rule.Operator + rule.RuleValue
- return "true"
}
if rule.TopicArg == "age"{
formula = strconv.Itoa(int(person.ThftRes.Age)) + rule.Operator + rule.RuleValue
- return "true"
}
- if rule.TopicArg == "others" {
+ if rule.TopicArg == "otherInfo" {
// 鍏朵粬杩欎釜鍊煎厛杩欎箞澶勭悊
return "true"
}
--
Gitblit v1.8.0