From d09f65efe90826dd76eaf0ca7cc618df9b09c40d Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 16 十一月 2019 12:53:00 +0800
Subject: [PATCH] 防止个体目标进入yolo结果
---
labelFilter/ruleForLabel.go | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/labelFilter/ruleForLabel.go b/labelFilter/ruleForLabel.go
index bb4f9a5..08d675b 100644
--- a/labelFilter/ruleForLabel.go
+++ b/labelFilter/ruleForLabel.go
@@ -160,7 +160,7 @@
func baseJudge(label *Label, rule *protomsg.EventPushRule) string {
if rule.RuleValue == "all" {
for _, personGroup := range label.Persons {
- for _, arg := range personGroup.Args {
+ for _, arg := range personGroup.AlarmObj {
if len(arg.Liker) > 0 {
logger.Info("婊¤冻鍏ㄩ儴搴曞簱瑙勫垯")
return "true"
@@ -170,7 +170,7 @@
return "false"
} else {
for _, personGroup := range label.Persons {
- for _, arg := range personGroup.Args {
+ for _, arg := range personGroup.AlarmObj {
for _, liker := range arg.Liker {
formula := "'" + liker.TableId + "'" + rule.Operator + "'" + rule.RuleValue + "'"
expression, err := govaluate.NewEvaluableExpression(formula);
@@ -199,7 +199,7 @@
//鏄惁绗﹀悎浜哄憳瑙勫垯
func personJudge(label *Label, rule *protomsg.EventPushRule) string {
for _, personGroup := range label.Persons {
- for _, person := range personGroup.Args {
+ for _, person := range personGroup.AlarmObj {
formula := ""
if rule.TopicArg == "sex" {
formula = strconv.Itoa(int(person.ThftRes.Gender)) + rule.Operator + rule.RuleValue
@@ -232,7 +232,7 @@
}
if rule.TopicArg == "monitorLevel" {
if rule.RuleValue == "all" {
- if len(personGroup.Args) > 0 {
+ if len(personGroup.AlarmObj) > 0 {
logger.Info("绗﹀悎浜哄憳绛夌骇涓哄叏閮ㄧ殑瑙勫垯")
return "true"
}
--
Gitblit v1.8.0