---

panlei

2019-08-06 52ea408f8ab6d4098a6c3b77042929fe34f10a09

---

 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"
            }