From dc77f38cb896aab2ee15840c50a66a78747422aa Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 18 十一月 2019 20:59:10 +0800
Subject: [PATCH] 缓存初始化字典

---
 algorithm/faceCompare/faceCompare.go |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/algorithm/faceCompare/faceCompare.go b/algorithm/faceCompare/faceCompare.go
index c97072b..f297ca2 100644
--- a/algorithm/faceCompare/faceCompare.go
+++ b/algorithm/faceCompare/faceCompare.go
@@ -1,4 +1,4 @@
-package faceCompare
+package main
 
 import (
 	"basic.com/pubsub/protomsg.git"
@@ -8,13 +8,14 @@
 	"strconv"
 )
 // 浜鸿劯绠楁硶
-func Entrance(rule *protomsg.Rule, am *structure.AreaMap) structure.LittleRuleResult {
+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)
 	return filterRule1(rule,am)
 }
 
 // 杩囨护瑙勫垯鍏堢瓫閫夊嚭绗﹀悎鏉′欢鐨勭洰鏍囨暟閲�
 func filterRule1(rule *protomsg.Rule, am *structure.AreaMap) structure.LittleRuleResult {
+
 	if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" || rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" {
 		// 澶勭悊鐨勬槸浜鸿劯绠楁硶 濡傛灉杩欐潯瑙勫垯閰嶇疆鐨勬槸浜鸿劯绠楁硶锛岃繃婊ゅ畬鏉′欢涔嬪悗鐩存帴寰楀嚭缁撴灉锛屽洜涓鸿偗瀹氭病鏈夋暟閲忔潯浠讹紝鑷繁鎷兼帴
 		//logger.Info("瑙勫垯鐨勭畻娉昳d鍜屽尯鍩熺殑绠楁硶id锛�", rule.SdkId, "===", am.sdkId)
@@ -64,15 +65,16 @@
 						//logger.Info("-----------------------浜鸿劯杩囨护鐨刟rgs閲岀殑鏁伴噺锛�", len(args))
 						for _, arg := range args {
 							var formula string
-							if rule.SdkArgAlias == "score" {
-								formula = strconv.FormatFloat(arg.Score, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
-								logger.Info("褰撳墠鐩镐技搴﹀皬鍏紡锛�", formula)
-							} else if rule.SdkArgAlias == "proportion" {
-								formula = strconv.FormatFloat(arg.Proportion, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
-								logger.Info("褰撳墠鍗犳瘮灏忓叕寮忥細", formula)
-							} else {
-								formula = strconv.FormatFloat(arg.Size, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
-								logger.Info("褰撳墠灏哄灏忓叕寮忥細", formula)
+							switch rule.SdkArgAlias {
+							case "score":
+								formula = strconv.FormatFloat(arg.Score, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
+								logger.Info("鐩镐技搴﹀皬鍏紡锛�", formula)
+							case "proportion":
+								formula = strconv.FormatFloat(arg.Proportion, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
+								logger.Info("鍗犳瘮鍏紡锛�", formula)
+							case "size":
+								formula = strconv.FormatFloat(arg.Size, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue
+								logger.Info("灏哄灏忓叕寮忥細", formula)
 							}
 							expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
 							result, _ := expression.Evaluate(nil)                      // 寰楀埌鏁板鍏紡鐨勭粨鏋�

--
Gitblit v1.8.0