From 6bc7833cd5e47bf60805125a2cbb71ee6097ec28 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 16 十二月 2019 17:04:47 +0800
Subject: [PATCH] ---
---
algorithm/static/static.go | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/algorithm/static/static.go b/algorithm/static/static.go
index 08d09da..ce26988 100644
--- a/algorithm/static/static.go
+++ b/algorithm/static/static.go
@@ -2,7 +2,7 @@
import (
"basic.com/pubsub/protomsg.git"
- logger "github.com/alecthomas/log4go"
+ "basic.com/valib/logger.git"
"github.com/knetic/govaluate"
"ruleprocess/ruleserver"
"ruleprocess/structure"
@@ -61,16 +61,16 @@
}
am.TargetNum = len(am.FilterData) // 鎶婄鍚堟潯浠剁殑鐩爣鏁伴噺鏇存柊鍒皌argetNum瀛楁
if am.TargetNum > 0 {
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort,am.FilterData}
} else {
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort,am.FilterData}
}
} else if rule.SdkArgAlias == "" {
if am.TargetNum > 0 {
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort,am.FilterData}
} else {
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort,am.FilterData}
}
}
return structure.LittleRuleResult{}
@@ -116,7 +116,7 @@
logger.Info("鏈抚鍖哄煙鍐呮棤鏁版嵁锛岃繑鍥�")
// 娓呯┖缂撳瓨鐨勭洰鏍�
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort,am.FilterData}
}
m := make(map[string]interface{})
m["target"] = []structure.Result{}
@@ -131,7 +131,7 @@
objs = append(objs, obj)
}
structure.StaticMap[am.AreaId] = &structure.CameraArea{objs}
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort,am.FilterData}
} else {
//logger.Info("涔嬪墠鏈夌紦瀛�")
flag := "false"
@@ -165,7 +165,7 @@
structure.StaticMap[am.AreaId].Targets = append(structure.StaticMap[am.AreaId].Targets, obj)
}
}
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
+ return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort,am.FilterData}
}
}
--
Gitblit v1.8.0