From 408da8a1dffc3cc08e1e721e510931dcc9ca3073 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 18 七月 2019 18:06:16 +0800
Subject: [PATCH] ---
---
ruleserver/readyDataForRule.go | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index d0530b9..00063f8 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -17,11 +17,11 @@
var serverIp,serverPort,dbTablePersons string
type conf struct {
PhotoUrl string `yaml:"photoUrl"`
- Videopersons string `yaml:"videoPersons"`
- Personaction string `yaml:"personAction"`
- Serverip string `yaml:"serverIp"`
- Serverport string `yaml:"serverPort"`
- Dbtablepersons string `yaml:"dbTablePersons"`
+ VideoPersons string `yaml:"videoPersons"`
+ PersonAction string `yaml:"personAction"`
+ ServerIp string `yaml:"serverIp"`
+ ServerPort string `yaml:"serverPort"`
+ DbTablePersons string `yaml:"dbTablePersons"`
}
func Init() {
data, err := ioutil.ReadFile("./config/conf.yml")
@@ -32,14 +32,15 @@
c := conf{}
//鎶妝aml褰㈠紡鐨勫瓧绗︿覆瑙ｆ瀽鎴恠truct绫诲瀷
yaml.Unmarshal(data, &c)
- serverIp = c.Serverip
- serverPort = c.Serverport
- dbTablePersons = c.Dbtablepersons
+ logger.Debug("閰嶇疆鏂囦欢鐨勫�间负锛�",c)
+ serverIp = c.ServerIp
+ serverPort = c.ServerPort
+ dbTablePersons = c.DbTablePersons
localConfig, err1 := cache.GetServerInfo()
if err1 != nil {
logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
- logger.Debug("鏈満淇℃伅锛�",localConfig)
+ logger.Debug("鏈満淇℃伅鍜宻erver淇℃伅锛�",localConfig,serverIp,serverPort)
bigCache.Init(dbTablePersons,serverIp,serverPort,localConfig.ServerId)
}
@@ -171,21 +172,23 @@
logger.Info("---------鐪嬬湅姣忎釜搴曞簱浜哄憳鐨勪俊鎭細",baseinfo.Id,baseinfo.PersonName)
var tableIds []string
tableIds = append(tableIds,baseinfo.TableId) // 铏界劧鏄紶鍏ユ暟缁勮繑鍥炴暟缁勭殑鎺ュ彛锛屼絾鎴戞寜鍗曚釜鐨勪娇鐢ㄤ簡
- table,err := esutil.Dbtablefosbyid(tableIds,dbTablePersons,serverIp,serverPort)
- if err != nil {
- logger.Error("鏍规嵁id鏌ヨ搴曞簱淇℃伅鍑洪敊锛�")
+ logger.Debug("鐪嬬湅鍥涗釜鍙傛暟锛�",tableIds,"dbtables",serverIp,serverPort)
+ table,err := esutil.Dbtablefosbyid(tableIds,"dbtables",serverIp,serverPort)
+ if err != nil || len(table) == 0{
+ logger.Error("鏍规嵁id鏌ヨ搴曞簱淇℃伅鍑洪敊锛�",err,"--杩斿洖鍊奸暱搴︿负锛�",len(table))
}
base := BaseInfo{TableId:baseinfo.TableId,TableName:table[0].TableName,BwType:table[0].BwType,CompareScore:float64(m[baseinfo.Id]),PersonId:baseinfo.Id,PersonName:baseinfo.PersonName,PersonPicUrl:baseinfo.PersonPicUrl,PhoneNum:baseinfo.PhoneNum,Sex:baseinfo.Sex,MonitorLevel:baseinfo.MonitorLevel,Content:""}
arg.Liker = append(arg.Liker, &base)
}
}
+ logger.Debug("liker鐨勯暱搴︿负锛�",len(arg.Liker))
os.Exit(1)
}
// 浜鸿劯姣斿
func Compare(args *SdkDatas, groupRule *protomsg.GroupRule) {
compareFlag := 0
var tableIds []string
- var threshold float32 = 50
+ var threshold float32 = 0.2
// 鐪嬬湅鏄惁鏈夊彧閰嶄汉鑴告瘮瀵圭畻娉曚絾娌℃湁閰嶅姣斿簱鐨勮鍒欙紝濡傛灉鏈夛紝鍒欐瘮瀵瑰璞′负鍏ㄩ儴搴曞簱
for j := 0; j < len(groupRule.Rules); j++ {
if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" { // 閰嶄簡浜鸿劯姣斿
@@ -220,8 +223,9 @@
for _, areaMap := range sdkData.AreaMapList {
logger.Info("-------------浜鸿劯姣斿涔嬪墠鐩爣鏁伴噺",len(areaMap.args))
// 鎷垮尯鍩熶腑姣忎釜浜鸿劯鐗瑰緛鍊煎幓瀵规瘮锛屽～鍏呭叾liker
+ logger.Debug("----鐪嬬湅涓や釜鍖哄煙id鏄惁涓�鑷达細",groupRule.Rules[j].PolygonId,areaMap.areaId)
if groupRule.Rules[j].PolygonId == areaMap.areaId {
- logger.Info("--------------鐪嬬湅compareFlag鐨勫�硷細",compareFlag)
+ logger.Info("--------------鐪嬬湅compareFlag鐨勫�煎拰tableId锛�",compareFlag,tableIds)
for _, arg := range areaMap.args {
if compareFlag == 1 {
arg.fillLiker(nil,threshold)
--
Gitblit v1.8.0