From 29e2b06be2e072c50a70f021d9f2d438807578a9 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 06 八月 2019 11:17:38 +0800
Subject: [PATCH] 人脸对比规则放开compareBase

---
 ruleserver/ruleToformula.go |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 5ddfec0..ae14a0b 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -519,7 +519,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" && rule.SdkArgAlias != "compareBase" {
+			if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && rule.SdkArgAlias != "time_rule"{
 				//logger.Debug("褰撳墠灏忚鍒欐槸锛�",rule)
 				flag := "false"
 				// 鎶婃病鏈夌浉浼艰�呯殑浜鸿劯浠巉ilterData涓垹闄�
@@ -535,6 +535,7 @@
 				if len(am.filterData) > 0 {
 					flag = "true"
 				}
+				logger.Info("---------浜鸿劯姣斿绗﹀悎鏉′欢鐨勬暟閲忎负锛�",len(am.filterData))
 				return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + flag, rule.Sort}
 			}
 			if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" { // 浜鸿劯妫�娴�
@@ -542,7 +543,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("---------------------------缁堜簬绛夊埌浣�")
+						logger.Info("-----------------------杩囪鍒欎箣鍓嶅尯鍩熷唴鐨勪汉鑴告暟閲忎负锛�",am.targetNum)
 						var args []*Arg
 						if rule.RuleWithPre == "&&" {
 							args = am.filterData
@@ -581,7 +582,7 @@
 							return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
 						}
 					} else {
-						return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+						return LittleRuleResult{}
 					}
 				} else {
 					return LittleRuleResult{}

--
Gitblit v1.8.0