From 6bc7833cd5e47bf60805125a2cbb71ee6097ec28 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 16 十二月 2019 17:04:47 +0800
Subject: [PATCH] ---
---
algorithm/face/face.go | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/algorithm/face/face.go b/algorithm/face/face.go
index 2e8530a..68313d6 100644
--- a/algorithm/face/face.go
+++ b/algorithm/face/face.go
@@ -4,11 +4,12 @@
"basic.com/pubsub/protomsg.git"
"github.com/knetic/govaluate"
"ruleprocess/structure"
+ "basic.com/valib/logger.git"
"strconv"
)
// 浜鸿劯绠楁硶
func Entrance(rule *protomsg.Rule, am *structure.AreaMap,lable *structure.Others,args *structure.SdkDatas,message *protomsg.SdkMessage) structure.LittleRuleResult {
- //logger.Debug("---------璧颁簡浜鸿劯妫�娴嬬畻娉�",rule.Id,rule.SdkArgAlias,rule.Operator,rule.SdkArgValue,am.AreaId)
+ logger.Debug("---------璧颁簡浜鸿劯妫�娴嬬畻娉�",rule.Id,rule.SdkArgAlias,rule.Operator,rule.SdkArgValue,am.AreaId)
return filterRule(rule,am)
}
@@ -40,7 +41,7 @@
flag = "true"
}
//logger.Info("---------浜鸿劯姣斿绗﹀悎鏉′欢鐨勬暟閲忎负锛�",len(am.FilterData))
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
+ return structure.LittleRuleResult{SdkName:am.SdkName, Result:rule.RuleWithPre + "" + flag, Sort:rule.Sort}
}
}
if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" { // 浜鸿劯妫�娴�
@@ -81,21 +82,18 @@
}
}
am.TargetNum = len(am.FilterData) // 鎶婄鍚堟潯浠剁殑鐩爣鏁伴噺鏇存柊鍒皌argetNum瀛楁
- if rule.RuleWithPre == "contain" {
-
- }
if am.TargetNum > 0 {
- //logger.Info("锛侊紒锛侊紒锛侊紒锛侊紒锛佷汉鑴告娴嬫垚鍔�")
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+ logger.Info("锛侊紒锛侊紒锛侊紒锛侊紒锛佷汉鑴告娴嬫垚鍔�")
+ return structure.LittleRuleResult{SdkName:am.SdkName, Result:rule.RuleWithPre + "" + "true", Sort:rule.Sort,Target:am.FilterData}
} else {
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ return structure.LittleRuleResult{SdkName:am.SdkName, Result:rule.RuleWithPre + "" + "false", Sort:rule.Sort}
}
}
} else if rule.SdkArgAlias == "" { // 浠�涔堝弬鏁伴兘涓嶉厤鐨勬儏鍐�
if am.TargetNum > 0 {
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+ return structure.LittleRuleResult{SdkName:am.SdkName, Result:rule.RuleWithPre + "" + "true", Sort:rule.Sort,Target:am.FilterData}
} else {
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ return structure.LittleRuleResult{SdkName:am.SdkName, Result:rule.RuleWithPre + "" + "false", Sort:rule.Sort}
}
}
}
--
Gitblit v1.8.0