From 41afac9d7f39ab0cf2591357a3b3df815f0f5299 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 09 七月 2019 18:42:01 +0800
Subject: [PATCH] 去掉人脸*100

---
 ruleserver/ruleToformula.go |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 0497a8e..29eb44c 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -2,7 +2,6 @@
 
 import (
 	"encoding/json"
-	"fmt"
 	"ruleprocess/cache"
 	"ruleprocess/logger"
 	"sort"
@@ -11,6 +10,7 @@
 	"time"
 
 	bigCache "basic.com/pubsub/cache.git"
+	"basic.com/pubsub/cache.git/esutil"
 	"basic.com/pubsub/protomsg.git"
 	"github.com/knetic/govaluate"
 )
@@ -247,13 +247,15 @@
 			}
 		}
 	}
+	// 浣滃紛锛岀洿鎺ヨ鍏舵瘮瀵瑰叏閮ㄥ簳搴�
+	compareFlag = 1
 	if compareFlag == 0 {
 		logger.Info("娌℃湁閰嶇疆瀵规瘮搴曞簱鍙傛暟")
 		return
 	}
 	for j := 0; j < len(groupRule.Rules); j++ {
 		// 鍙湁鏄汉鑴稿姣斿苟涓旈厤缃殑鍙傛暟鏄姣斿簳搴撴墠璧帮紙鑻ラ厤鐨勫姣旈槇鍊煎垯涓嶈蛋锛�
-		if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && groupRule.Rules[j].SdkArgAlias == "compareBase" {
+		if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972"{
 			for _, sdkData := range args.Sdkdata {
 				if sdkData.IpcId == "812b674b-2375-4589-919a-5c1c3278a97e" { // 鎼滅储鍒颁汉鑴告娴嬬殑sdkdata 鐜板湪鍏充簬浜鸿劯鐨勫彧鏈変粬涓�涓猻dk锛屽叏鎵句粬
 					for _, areaMap := range sdkData.AreaMapList {
@@ -268,8 +270,10 @@
 										logger.Error("getBaseInfo瑙e帇閿欒", err1)
 									}
 									for key, val := range m {
-										fmt.Println(key)
-										baseinfo := protomsg.Baseinfo{}
+										baseinfo,err1 := esutil.Dbpersoninfosbyid(key)
+										if err1 != nil {
+											logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊",err1)
+										}
 										baseinfo.CompareScore = val
 										arg.Liker = append(arg.Liker, &baseinfo)
 									}
@@ -284,8 +288,10 @@
 											logger.Error("getBaseInfo瑙e帇閿欒", err1)
 										}
 										for key, val := range m {
-											fmt.Println(key)
-											baseinfo := protomsg.Baseinfo{}
+											baseinfo, err1 := esutil.Dbpersoninfosbyid(key)
+											if err1 != nil {
+												logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊",err1)
+											}
 											baseinfo.CompareScore = val
 											arg.Liker = append(arg.Liker, &baseinfo)
 										}

--
Gitblit v1.8.0