From 173ba382e4f383d7d5b72e4d58f8b576bc1762c7 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 20 八月 2019 14:31:22 +0800
Subject: [PATCH] 完善中间件
---
algorithm/face/face.go | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/algorithm/face/face.go b/algorithm/face/face.go
index f1059aa..1e4ba5f 100644
--- a/algorithm/face/face.go
+++ b/algorithm/face/face.go
@@ -1,4 +1,4 @@
-package face
+package main
import (
"basic.com/pubsub/protomsg.git"
@@ -7,9 +7,10 @@
"ruleprocess/structure"
"strconv"
)
-
-func Entrance () {
-
+// 浜鸿劯绠楁硶
+func Entrance(rule *protomsg.Rule, am *structure.AreaMap) structure.LittleRuleResult {
+ logger.Debug("---------璧颁簡浜鸿劯绠楁硶",rule.Id,rule.SdkArgAlias,rule.Operator,rule.SdkArgValue,am.AreaId)
+ return filterRule(rule,am)
}
// 杩囨护瑙勫垯鍏堢瓫閫夊嚭绗﹀悎鏉′欢鐨勭洰鏍囨暟閲�
@@ -18,7 +19,7 @@
//logger.Info("瑙勫垯鐨勭畻娉昳d鍜屽尯鍩熺殑绠楁硶id锛�", rule.SdkId, "===", am.sdkId)
if rule.PolygonId == am.AreaId { // 绠楁硶鍜屽尯鍩熼兘寰楀鐨勪笂
- if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && rule.SdkArgAlias != "time_rule"{
+ if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && rule.SdkArgAlias != "time_rule"{ // 浜鸿劯姣斿
//logger.Debug("褰撳墠灏忚鍒欐槸锛�",rule)
flag := "false"
// 鎶婃病鏈夌浉浼艰�呯殑浜鸿劯浠巉ilterData涓垹闄�
@@ -43,7 +44,7 @@
if rule.Operator == "==" || rule.Operator == ">=" || rule.Operator == "<=" || rule.Operator == "<" || rule.Operator == ">" || rule.Operator == "!=" {
// 濡傛灉鏄笉瑙勭煩鐨勮繛鎺ョ缁熺粺杩斿洖false 瑙勫垯涔熷彧鑳藉垽鏂汉鑴哥殑鐩镐技搴︼紝鎵�浠ヤ笉瀛樺湪鍒殑杩炴帴绗�
if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
- logger.Info("-----------------------杩囪鍒欎箣鍓嶅尯鍩熷唴鐨勪汉鑴告暟閲忎负锛�",am.TargetNum)
+ logger.Info("-----------------------杩囪鍒欎箣鍓嶅尯鍩熷唴鐨勪汉鑴告暟閲忎负锛�",am.TargetNum,"--鍖哄煙--",am.AreaJson)
var args []*structure.Arg
if rule.RuleWithPre == "&&" {
args = am.FilterData
--
Gitblit v1.8.0